Maybe sync on slave promotion.
Explain
Merged bug25870 into stable
Oops, that should have gone in bug 25415
Improve comment.
More explanation
Merge bug25867
Merge in stable