Fixed failed master catch-up after rejoining cluster
Merge branch '1.9-maint' into 2.0-maint