Merge "Update Dell EMC Cinder back end services" into stable/ocata