Merge "[radosgw, upgrades] Fix for radosgw keyring path and user"