Merge "Update cinder-netapp-config environment"