Merge branch 'netcore/feature/non-static-iohelper' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project

# Conflicts:
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Tests/Composing/CompositionTests.cs

src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs

@@ -38,7 +38,7 @@ namespace Umbraco.Tests.TestHelpers
 
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
             var typeLoader = new TypeLoader(NoAppCache.Instance,
-                IOHelper.MapPath("~/App_Data/TEMP"),
+                Current.IOHelper.MapPath("~/App_Data/TEMP"),
                 logger,
                 false);