CORE-1760 Improved test infrastructure

Working on db2 linux vagrant, fixes for postgresql on windows vagrant
Merge remote-tracking branch 'origin/master'