Merge branch 'master' of github.com:voldemort/voldemort into dds-2832-gap-stats