Get fixes from dwalk branch.
Merge pull request #1898 from VoltDB/ENG-7339

Get fixes from dwalk branch.