Revert "Merge branch 'release-7' into jetty-7"

This reverts commit 624a0d7e455330836ed8b99c39a1686cd1210869, reversing
changes made to 3eb84f99a45d81acf55deb1c12be9ac9b6042d1f.

Conflicts:
	VERSION.txt