STOP THE LINE: fixing flaky test
Merge pull request #685 from rackerlabs/flakytest

STOP THE LINE: fixing flaky test
resolving merge conflicts