Fixed the Scala 2.11 scripted tests

The scripted test build was always built against Scala 2.11, this meant
the build only passed if a 2.10 build happened to run on the same agent
before.
Merge pull request #3579 from jroper/fix-211-scripted-tests

Fixed the Scala 2.11 scripted tests
Upgrade hibernate
Merge pull request #3589 from mkurz/hibernateUpgrade

Upgrade hibernate
Simplify configuration for NingWSClient