Merge "Convert cephstorage-role.yaml to role.role.j2.yaml"