merging from upstream master for rabbit and rbd changes