Moved new JSON classes to the right module.
Merged branch 'master' into 'jetty-9.1'.