Merge remote-tracking branch 'ceph/master' into ses5

diff --cc ceph.spec.in
index 5911ffc639014395d00705d159b0c759794c1696,35ce7add2fce065171e77a1038aa16136ab453b4..dfccf02a9637150218ecd3d00e315b3239421fdd
--- 1/ceph.spec.in
--- 2/ceph.spec.in
+++ b/ceph.spec.in
@@@ -12,9 -13,9 +12,9 @@@
  # This file is under the GNU Lesser General Public License, version 2.1
  #
  # Please submit bugfixes or comments via http://tracker.ceph.com/
- # 
+ #
  %bcond_without ocf
 -%bcond_without cephfs_java
 +%bcond_with cephfs_java
  %if 0%{?suse_version}
  %bcond_with ceph_test_package
  %else

diff --cc src/CMakeLists.txt
Simple merge