await_cluster_recovery/0 should return ok.
Merged bug25700 into stable
Merged stable into default