Minor fix to the sample
MPS-19332 - reworded the error message, added a re-balancing quick-fix
Merge remote-tracking branch 'origin/master' into 3.1/vaclavFixes
Merge remote-tracking branch 'origin/master' into 3.1/vaclavFixes