Wip rgw geo rebase

This branch serves as a rebase of wip-rgw-geo-2 to compress out some fix commits and allow review. This pull request serves for tracking comments, but it should not be merged yet.