Merge branch 'next'

Conflicts:
	debian/ceph.prerm

diff --cc debian/ceph.prerm
index 17f8bcc309715eaa5d75c4659e092ebfe10c1724,4aac21400a9aa845736f7be7ef7ba8c32bb911d3..ad509223cbc59462fcebd8e2f1a855a8b3ca3ab2
--- 1/debian/ceph.prerm
--- 2/debian/ceph.prerm
+++ b/debian/ceph.prerm
@@@ -1,17 -1,6 +1,24 @@@
  #!/bin/sh
 +# vim: set noet ts=8:
  
 -[ -x /sbin/stop ] && stop ceph-all || :
 -[ -x /usr/sbin/service ] && service ceph stop || :
 +set -e
  
 -exit 0
 +invoke-rc.d ceph-all stop || {
 +      RESULT=$?
 +      # Ignore if ceph-all upstart config does not
 +      # exist or upstart is not in use
 +      if [ $RESULT != 100 ]; then
 +              exit $RESULT
 +      fi
 +}
 +
++invoke-rc.d ceph stop || {
++      RESULT=$?
++      if [ $RESULT != 100 ]; then
++              exit $RESULT
++      fi
++}
++
 +#DEBHELPER#
 +
 +exit 0