Fix z-index issue for issue #1314
Fixes propagation issue for overlayed help, for issue #1315
More z-index fixes related to collab tab
Fix compiled css conflict
Merge branch 'gh-1315' into new-editor-primary-staging