backport rabbit 3.3 to omnibus/3.2-stable branch