HCOLL-113 removed deleteOnExit and added synchronized  to builder.stmt()
Merge remote-tracking branch 'origin/master'