Merged stable into default
Unbreak SSL tests, broken in bug 25002.
Added tag rabbitmq_v3_1_2 for changeset a9e5a749d5d3
Added tag rabbitmq_v3_1_3 for changeset 28d440117610
s/VMware/GoPivotal/g
Merged bug25538 into stable
Merged stable into default
Do not corrupt state on server-sent basic.cancel.
Minimise distance from stable
Merged bug25691 into stable
stable to default (someone forgot)
Added tag rabbitmq_v3_1_4 for changeset 6839d9144428
stable to default
Added tag rabbitmq_v3_1_5 for changeset 3d1afafbf8dd
stable to default
Prevent possible deadlock because children call parents
Spacing
Changes and renaming
reduce distance to default
Merge bug25692