Merge branch 'next'

diff --cc src/java/java/com/ceph/fs/CephMount.java
Simple merge

diff --cc src/java/native/libcephfs_jni.cc
Simple merge

diff --cc src/java/test/com/ceph/fs/CephMountTest.java
Simple merge