Merge "Use a different ceph key for admin/client user"