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
[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
[BIServer 8408] Toggle Administration does not hide toolbar
Merge branch 'master' into dev
Changes for BISERVER-8335 Update the Import Service to consume .property
files using the repository API
Merge pull request #125 from e-cuellar/master

Changes for BISERVER-8335  Update the Import Service to consume .property files using the repository API
Merge pull request #126 from pentaho-tband/dev

[BIServer 8408] Fixed bug -Administration toggle button does not hide toolbar
[BISERVER-8446] Lock/Checkout repository file before locale properties delete/update. Unlock/Check-in when done
Tests updated
Merge pull request #127 from bytekast/master

[BISERVER-8446] Lock/Checkout repository file before locale properties delete/update. Unlock/Check-in when done