Merge master to 9.2 branch

I've merged all changes in the pgjdbc master branch along with my Maven deployment changes to the build scripts and created this PR to merge onto the 9.2 devel branch. Please review and if suitable accept the change to get the latest code onto the branch.