ok, i think i fixed up the branches. @fancy-queen-20734: 1.7.x is now https://travis-ci.org/pantsbuild/pants/builds/377962672 (edit for second rebase)