backport rabbit 3.3 to omnibus/3.2-stable branch

backport rabbitmq 3.3.

this uses the old syntax like the existing config on this branch.  LMK if that's the right thing to do