Fixes for H2 Database to force MV Store engine to not be used.
Additional cleanups and changes from testing Corrupted H2 DB.