@aloof-angle-91616: i'm going to pick the 1.8.x stuff from https://github.com/pantsbuild/pants/issues?utf8=%E2%9C%93&q=label%3Aneeds-cherrypick+ to the 1.8.x branch... but anything that needs picking to 1.8.x also needs picking to 1.9.x