Merge remote-tracking branch 'origin/master' into wip-rgw-ldap

diff --cc debian/control
Simple merge

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/rgw/rgw_lib.h
index 85a4c31642909bad613cbbf57923789c3d24c90f,be5add4564af6f7ee5bacf96165691550674e131..f418a6d19739fe302b6e6ee5486c6a966f5a0840
--- 1/src/rgw/rgw_lib.h
--- 2/src/rgw/rgw_lib.h
+++ b/src/rgw/rgw_lib.h
@@@ -26,9 -24,7 +26,8 @@@ namespace rgw 
      RGWFrontendConfig* fec;
      RGWLibFrontend* fe;
      OpsLogSocket* olog;
 +    rgw::LDAPHelper* ldh;
      RGWREST rest; // XXX needed for RGWProcessEnv
-     RGWProcessEnv env;
      RGWRados* store;
  
    public:

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

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

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

diff --cc src/test/CMakeLists.txt
Simple merge

diff --cc src/test/Makefile-client.am
Simple merge