MPS-20948 Mac OS X 10.10, JDK 1.6: MPS editor is flickering a lot
correcting broken references
trying to avoid extra-repainting of the whole editor.
Merge remote-tracking branch 'origin/master' into 3.2/editorFixes
Merge remote-tracking branch 'origin/master' into 3.2/editorFixes