version under testing with joe -> admin
Merge pull request #89 from jcaldwell/dev

BISERVER-8471 Revert to add back version checker.
BISERVER-8101: Added interfaces and selected implementations for the blockout manager.
Merge pull request #90 from wseyler/dev

BISERVER-8101: Added interfaces and selected implementations for the blo...
BISERVER-8435 Add getSystemRoles to IUserRoleListService and use in puc
Merge pull request #91 from tkafalas/master

BISERVER-8435 Implement getSystemRoles in IUserRoleListService
Update SolutionTest.java

Commenting the test
Update SolutionTest.java

commenting the test
Update SolutionTest.java

commenting the test
[BISERVER-7777] allow empty list in RepositoryFileTreeDto#children to be properly serialized
[BISERVER-7777] test case
Merge pull request #92 from webdetails/biserver-7777

Biserver 7777
Merge branch 'master' into BISERVER-8427

Conflicts:
	extensions/test-src/org/pentaho/platform/plugin/services/metadata/MetadataRepositoryLifecycleManagerTest.java
	extensions/test-src/org/pentaho/test/platform/security/userroledao/jackrabbit/UserRoleDaoTest.java
	extensions/test-src/org/pentaho/test/platform/web/http/api/FileResourceTest.java
	extensions/test-src/org/pentaho/test/platform/web/http/api/RepositoryResourceTest.java
	repository/test-src/org/pentaho/platform/repository2/unified/webservices/jaxws/UnifiedRepositoryToWebServiceAdapterTest.java
	repository/test-src/org/pentaho/test/platform/repository2/mt/RepositoryTenantManagerTest.java
	repository/test-src/org/pentaho/test/platform/security/userroledao/UserRoleDaoUserDetailsServiceTest.java
	repository/test-src/org/pentaho/test/platform/security/userroledao/UserRoleDaoUserRoleListServiceTest.java

Admin user added and joe removed.
Roles updated
BISERVER-8136 ToolTip and Alignment of scheduler toolbar
Merge pull request #93 from pentaho-tband/master

BISERVER-8136 ToolTip and Alignment of scheduler toolbar
PDI-9368 Updating UserRoleWebservice with appropriate spring bean
Merge pull request #94 from brosander/PDI-9368

PDI-9368 Updating UserRoleWebservice with appropriate spring bean
PDI-9368 Updating UserRoleWebserviceTest to use new spring bean name
Merge remote-tracking branch 'upstream/master' into PDI-9368
Merge pull request #95 from brosander/PDI-9368

PDI-9368 Updating UserRoleWebserviceTest to use new spring bean name