Bumping up a couple version numbers to get the stuff to compile. Not
verified completely, except that the tests run and I was able to do a
few queries against the server.