Because of extensive nature of changes, tested all three non-memstore backends - passed.
This makes almost no changes to source, but touches every almost file. Also fixes error in gremlin test code.