Revert "Merge branch 'feature/517' into develop"

Revert #517; instead of providing support for
http-interop/http-middleware 0.5.0 in the v2 release series, we will
stick to 0.4.1, and v3 will upgrade to PSR-15 final.

This reverts commit 5b272ea, reversing
changes made to 7c0dec8.

Conflicts:
	composer.lock
	test/ApplicationTest.php

Author: weierophinney

CHANGELOG.md

@@ -6,11 +6,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- [#517](https://github.com/zendframework/zend-expressive/pull/517) adds
-  support for http-interop/http-middleware 0.5.0 via a polyfill provided by the
-  package webimpress/http-middleware-compatibility. Essentially, this means you
-  can drop this package into an application targeting either the 0.4.1 or 0.5.0
-  versions of http-middleware, and it will "just work".
+- Nothing.
 
 ### Changed
 

composer.json

@@ -24,20 +24,16 @@
             "dev-develop": "2.1-dev"
         }
     },
-    "config": {
-        "sort-packages": true
-    },
     "require": {
         "php": "^5.6 || ^7.0",
         "fig/http-message-util": "^1.1.2",
         "http-interop/http-middleware": "^0.4.1",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
-        "webimpress/http-middleware-compatibility": "^0.1.1",
         "zendframework/zend-diactoros": "^1.3.10",
-        "zendframework/zend-expressive-router": "^2.2",
+        "zendframework/zend-expressive-router": "^2.1",
         "zendframework/zend-expressive-template": "^1.0.4",
-        "zendframework/zend-stratigility": "^2.1"
+        "zendframework/zend-stratigility": "^2.0.1"
     },
     "require-dev": {
         "filp/whoops": "^2.1.6 || ^1.1.10",