Merge pull request #2091 from ceph/wip-kinetic-os

prototype kinetic osd backend

Reviewed-by: Sage Weil <sage@redhat.com>

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

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

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

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

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