Minor clean up of the samples code
MPS-19049 - added checking for (not commented out) references to members of private classifiers
Merge remote-tracking branch 'origin/master' into 3.1/vaclavFixes
Rebuilt