Fixed serialization bugs
Merge pull request #196 from krivera-pentaho/dev

BISERVER-8101 -- Updated DefaultBlockOutManager to include a method of d...
Merge pull request #197 from wseyler/dev

Fixed serialization bugs
Changed api/roles and api/users calls to use the right api/userrole
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8622
BISERVER-8504 - Added call allRoles to fetch all roles including the extraRoles argument. Updated user console to make this call
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8504
Added support for "partially blocked" to REST services.
BISERVER-8301: Added initial logic for calling REST to check for conflicts
BISERVER-8427 - Added publish abs to the new default roles
Merge pull request #202 from pentaho-skarmali/master

BISERVER-8103: Initial REST call to add blockout period
Merge pull request #200 from wseyler/dev

Added support for "partially blocked" to REST services.
Merge pull request #201 from webdetails/BISERVER-8427

BISERVER-8427
Merge pull request #199 from webdetails/BISERVER-8504

BISERVER-8504
Merge pull request #198 from webdetails/BISERVER-8622

BISERVER-8622
BISERVER-8570 Fixed some of the ui related issues
Fixing unit test compile error
Merge pull request #203 from rmansoor/master

BISERVER-8570 Fixed some of the ui related issues
BISERVER-8427 - Updated Action Based Security for startup roles
BISERVER-8578 - refactoring WorkspacePanel to cleanly add a new panel for managing blockout periods.