Minimize and isolate a few straggler VoltDB patches to hsql
ENG-5808 tweak hsql patch annotations