Merge remote-tracking branch 'origin/nautilus' into nautilus

Conflicts:
	src/msg/async/ProtocolV2.cc - rename of outcoming_bl to outgoing_bl

diff --cc CMakeLists.txt
Simple merge

diff --cc src/msg/async/ProtocolV2.cc
Simple merge

diff --cc src/msg/async/ProtocolV2.h
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge