https://github.com/pantsbuild/pants/pull/4542 is probably ready for an initial review - couple more test failures to shake out, but looking good.