backports to bobtail for rbd bug fixes

These passed the rbd regression suite perfectly