fix pop-up diff
Remove hack from EditorComponent
minor code changes
Merge remote-tracking branch 'origin/master' into 3.0/mikev/test
MPS-17698 - fix NPE