Merge "ceph grains keyring fixes"