DDF-46: Had to change some dependency versions and update code to work with the newer dependency versions.

Most of the changes due to OSGi now using generics and jetty being upgraded.