Fix unit test
Merge branch '6.0.7' into 6.1.2

Conflicts:
	src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
Fix unit test by ensuring config file is copied if it doesn't exist