Bugfix for issues encountered by Voldemort & Distributed Test Framework
Updated as per review
Merge pull request #272 from SharadGandhi/master

Bugfixes for Voldemort & Distributed Test Framework