Merged EnvironmentExtensions into OwinHttpMessageHandler
Fix filename and namespaces