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
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
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
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427
BISERVER-7898 - IE9 Unable to login qa-platforms.petnaho.com:7080 default security settings

Added require.js and require-cfg.js to the spring security FilterSecurityInterceptor whitelist in applicationContext-spring-security.xml.
BISERVER-8551 - creating a quartz job implementation that will prevent execution of an ActionAdapterQuartzJob when it is executed during a blockout period.
Merge pull request #114 from jeffreythomas/dev

BISERVER-7898 - IE9 Unable to login qa-platforms.petnaho.com:7080 defaul...
Merge pull request #115 from kurtwalker/master

BlockingQuartzJob
Fix for BISERVER-8553. The MondrianImportHandler now constructs properly the connection string by using all the custom parameters, if any.
Merge pull request #116 from lucboudreau/master

Fix for BISERVER-8553
BISERVER-8290 IE9 - New Schedule Email Setup, unable to type until you
select yes to email, click back and next.
Import cleanup
Warning cleanup
[BISERVER-8446] Rename new JCR methods more intuitively
Merge pull request #117 from bytekast/master

[BISERVER-8446] Refactor/Rename new JCR methods
[BIServer 8408] Fix toggle menu item check
Merge pull request #118 from pentaho-tband/master

[BIServer 8408] Fix for menu item toggle buttons to check and uncheck perspectives
[BISERVER-8446] Change returned Locale objects to Serializable PentahoLocale wrapper
Merge pull request #119 from bytekast/master

[BISERVER-8446] Change returned Locale objects to Serializable PentahoLocale wrapper
[BIServer 8408] Fix toolbar on Admin perspective