Merge pull request #2715 from lutovich/1.9-maint

Fixed failed master catch-up after rejoining cluster
Fix compilation error