* Update more dependencies to newer versions * Add lockfiles and back out 2 problematic dep updates * Fix the build (backs out more changes) * Back out qdox 2.0 too