fixes some test logic
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
fixes some test logic
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs