Patches that make things more friendly to oracle jdbc driver
Merge branch 'master' into oracle