Merge "fix radosgw proxy configuration"