[BIServer 8408] Rework code after failed merge.  Found bug in workspace
menu item did not set perspective and would not toggle.
Merge pull request #152 from pentaho-tband/master

[BIServer 8408] Rework code after failed merge. Found bug in workspace