Merge "Update cinder config files permissions"