Merge branch 'wip-keystone' into wip-rgw-integration

Conflicts:
	debian/control

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

diff --cc debian/control
index dbf95fa944fe9c683225d93e1cb165cd042cd38a,5512f6d7dfa07ba6d39a953c5261b39d88aff22f..45030953a98133316759b8ff96cfa8a71f4d2ad9
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -6,7 -6,7 +6,7 @@@ Vcs-Git: git://github.com/ceph/ceph.gi
  Vcs-Browser: https://github.com/ceph/ceph
  Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
  Uploaders: Sage Weil <sage@newdream.net>
- Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.34), libedit-dev, libnss3-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libcurl4-gnutls-dev, libkeyutils-dev, uuid-dev, libaio-dev, python (>= 2.6.6-3~), libxml2-dev, javahelper, default-jdk
 -Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.34), libboost-thread-dev, libedit-dev, libnss3-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libcurl4-gnutls-dev, libkeyutils-dev, uuid-dev, libaio-dev, python (>= 2.6.6-3~), libxml2-dev
++Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.34), libboost-thread-dev, libedit-dev, libnss3-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libcurl4-gnutls-dev, libkeyutils-dev, uuid-dev, libaio-dev, python (>= 2.6.6-3~), libxml2-dev, javahelper, default-jdk
  Standards-Version: 3.9.3
  
  Package: ceph

diff --cc doc/radosgw/config.rst
Simple merge

diff --cc src/Makefile.am
Simple merge

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

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

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

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

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