master: NonValidatingFactory should be included in both JDBC3 and JDBC4

Apply fix for #92 to master