Merge remote-tracking branch 'enovance/wip-rgw-geo-2-replicalog' into wip-rgw-geo-3

Conflicts:
	src/Makefile.am
	src/rgw/rgw_main.cc

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
rgw: fix compilation

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>