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-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
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
[BISERVER-8446] Configure method level transactions for new JCR API
Merge pull request #121 from bytekast/master

[BISERVER-8446] Configure method level transactions for new JCR API
[BISERVER-8446] Configure method level transactions for new JCR API
Merge pull request #122 from bytekast/master

[BISERVER-8446] Configure method level transactions for new JCR API
[BISERVER-8446] Configure method security interceptor for new JCR API
Merge pull request #123 from bytekast/master

[BISERVER-8446] Configure method security interceptor for new JCR API
[BISERVER-8446] Auto-create pho:locales node if it does not exist when setting locale properties
Merge pull request #124 from bytekast/master

[BISERVER-8446] Auto-create pho:locales top-level node when setting locale properties