backports from master for jTDS 1.2.7