Fix failing tests
Merge branch 'master' into CodeBetterBuildServer

Conflicts:
	tests/NLog.UnitTests/LayoutRenderers/AppSettingTests.cs