Fix embarassment perpetrated in 97f0e3842c04.
Merge bug25689 (again)
stable to default
await_cluster_recovery/0 should return ok.
Added tag rabbitmq_v3_1_4 for changeset f0c729980bc9
stable to default
Merged bug25700 into stable
Merged stable into default