Merge branch 'master' into patch

diff --cc src/test/pybind/test_rbd.py
index c941a7babc81e7ba07c18c1f6a54be468ca3fb71,2bd9481484f5310f7fb7cdb094ba4e8aa042b2e4..8060b50d487e8d28f35f3f39f1ad7e8a820b21a4
--- 1/src/test/pybind/test_rbd.py
--- 2/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@@ -762,9 -767,13 +767,16 @@@ class TestImage(object)
          self.image.remove_snap('snap1')
          eq([], list(self.image.list_snaps()))
  
 +    def test_remove_snap_not_found(self):
 +        assert_raises(ImageNotFound, self.image.remove_snap, 'snap1')
 +
+     def test_remove_snap2(self):
+         self.image.create_snap('snap1')
+         self.image.protect_snap('snap1')
+         assert(self.image.is_protected_snap('snap1'))
+         self.image.remove_snap2('snap1',1)
+         eq([], list(self.image.list_snaps()))
+ 
      def test_remove_snap_by_id(self):
        eq([], list(self.image.list_snaps()))
        self.image.create_snap('snap1')