update Oracle JDBC to version 12.1.0.1 for Java 6
Merge branch 'master' into oracle-12
remove ojdbc14.jar, re-introduced by mistake merging with master