improved mock_nodetool and related plumbing