Merge branch 'release-7' into jetty-7
413372 JSON Enum uses name rather than toString()
413371 - Default JSON.Converters for List and Set.

Introduced a JSONCollectionConvertor that is able to convert
Collections, and hence both List and Set.

Code cleanups.
Reverted version to 7.6.12-SNAPSHOT.
Reverted VERSION.txt.
Merge branch 'jetty-7' into release-7
set for release