Issue #887/#888

The PR includes fixes for #887 and #888 (file vesron).
No, on the **next** if construct, we seem to have this twice: ````WorkbenchWindow.PROP_COOLBAR_VISIBLE.equals(property)````