Update to 6.0.0.Final

Mostly the same, though replaced commented deps with true optional
attribute.
Avoid rest-related errors and use previous marshalling package

A number of classes moved, but their behavior didn't change, so we can
safely use the older ones, i.e. those from the 'api' module.