BISERVER-8154: Ran into a bug updating jdbc connections. Turned out the locale properties were saved without checking if the locale node already exists.
Merge pull request #191 from rpbouman/master

Check if the local node already exists before saving locale properties.
BIServer 7887 - Move messages to correct package for Xaction parameter
display
Merge pull request #192 from pentaho-tband/dev

BIServer 7887 - Move messages to correct package for Xaction parameter
BISERVER-8044 - fixed issue with abs roles being cleared at the
startup
Merge pull request #193 from rmansoor/master

 	BISERVER-8044 - fixed issue with abs roles being cleared at the startup
BISERVER-8520 - Addid a magic ace for publish
Merge pull request #194 from rmansoor/master

BISERVER-8520 - Addid a magic ace for publish
BISERVER-8044 - Admin acls do not get returned to the caller
Merge pull request #195 from rmansoor/master

BISERVER-8044 - Admin acls do not get returned to the caller
Fixed serialization bugs
BISERVER-8101 -- Updated DefaultBlockOutManager to include a method of determining if a single schedule will be partially blocked by existing block out triggers.
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