[BIServer 8408] Rework code after failed merge.  Found bug in workspace
menu item did not set perspective and would not toggle.
BISERVER-8101 - Added the functionality for determining event logic and conflicts
Merge pull request #152 from pentaho-tband/master

[BIServer 8408] Rework code after failed merge. Found bug in workspace
Merge pull request #153 from wseyler/dev

biserver-8101: Fixed REST service so that it correctly serialized a prox...
Merge pull request #154 from krivera-pentaho/dev

BISERVER-8101 - Added the functionality for determining event logic and ...
BISERVER-8044 - Added update acl check
Merge pull request #155 from rmansoor/master

 BISERVER-8044 - Added update acl check
[BISERVER-8446] localize title and description during RepositoryFile to RepositoryFiteDTO conversion
BISERVER-8101 - Updated Rest methods to comply with the IBlockoutManager interface method signatures
Merge pull request #156 from bytekast/master

[BISERVER-8446] localize title and description during RepositoryFile to RepositoryFiteDTO conversion
Merge pull request #157 from krivera-pentaho/dev

BISERVER-8101 - Updated Rest methods to comply with the IBlockoutManager...
[BISERVER-8446] localize title and description during RepositoryFile to RepositoryFiteDTO conversion
Merge pull request #158 from bytekast/master

[BISERVER-8446] localize title and description during RepositoryFile to RepositoryFiteDTO conversion
BISERVER-8044 fixing unit tests
Merge pull request #159 from rmansoor/master

BISERVER-8044 fixing unit tests
BISERVER-8044 - Fixing unit test
Merge pull request #160 from rmansoor/master

BISERVER-8044 - Fixing unit test
[BISERVER-8564] - Use Jersey friendly return types
Merge pull request #161 from bytekast/master

[BISERVER-8564] - Use Jersey friendly return types
Updated test to include UpdateBlockout test.