Merge "Fixes ceph key import failures"