Fix coverage tests on MacOS

Testing Done:
build-support/bin/ci.sh on my mac laptop.

ci green @ https://travis-ci.org/pantsbuild/pants/builds/35870205

Bugs closed: 595

Reviewed at https://rbcommons.com/s/twitter/r/1057/
Payload refactor