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 8408] Fix toolbar on Admin perspective
Missed file
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427

Commit under testing for pull upstream master
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8427
Tests updated
[BIServer 8408] fix NPE when menuItem is not been set
BISERVER-8101 - switching to the BlockingQuartzJob for scheduled jobs.  Defaulting the shouldFire to true until an implementation is written.
Merge pull request #130 from kurtwalker/master

using BlockingQuartzJob
Locale Import Handler unit test
Merge pull request #131 from e-cuellar/master

Locale Import Handler unit test
Merge pull request #129 from tkafalas/master

Fix ofr Enunciate
[BISERVER-8564] Add localePropertiesMap to RepositoryFileDto
Merge pull request #132 from bytekast/BISERVER-8564

[BISERVER-8564] Add localePropertiesMap to RepositoryFileDto
Merge pull request #128 from pentaho-tband/dev

[BIServer 8408] fix NPE when menuItem is not been set