Merged default into stable

Merged stable into default

Added tag rabbitmq_v3_1_4 for changeset 85d6476a34eb

merge bug25686 into stable

Added tag rabbitmq_v3_1_2 for changeset 2de3fdddd8d0

merge bug25633 into stable

merge bug25561 into stable

make a test more defensive

Added tag rabbitmq_v3_0_3 for changeset a9099efdfbca

Added tag rabbitmq_v3_0_2 for changeset 3d7c1de05fad