version under testing with joe -> admin
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
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
Merge pull request #96 from krivera-pentaho/dev

BISERVER-8321 - Made RunInBackgroundCommand create a scheduleRequest wit...
BISERVER-8094 As a scheduler user I want the ability to name a schedule
BISERVER-8460 - Dragging a report to Dashboard hightlights all reports.
Merge pull request #97 from jeffreythomas/dev

BISERVER-8460 - Dragging a report to Dashboard hightlights all reports.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427

Conflicts:
	extensions/test-src/org/pentaho/platform/plugin/services/metadata/MetadataRepositoryLifecycleManagerTest.java

Reverted changed roles to better testing with datasources
BISERVER-8094 As a scheduler user I want the ability to name a schedule
BISERVER-8435 Fix LDAP spring configuration
Merge pull request #98 from tkafalas/master

Fix for LDAP spring configuration
BISERVER-8101: Added implementation for blockout manager added test refactored the triggers
BISERVER-7777 Backing out due to PUC broken
Merge pull request #100 from wseyler/dev

BISERVER-8101: Added implementation for blockout manager added test refa...
BISERVER-8354 - PUC Launch frame is shifted to the right and only partially visible

added code to handle resizing the right panel (content) when the splitter bar is used
Merge pull request #101 from rfellows/dev

BISERVER-8354 - PUC Launch frame is shifted to the right and only partia...
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427

Reverted initial roles for testing
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427