fixed flaky tests

Testing Done:
https://travis-ci.org/pantsbuild/intellij-pants-plugin/builds/42931405

Reviewed at https://rbcommons.com/s/twitter/r/1422/
Merge branch 'master' into exclude-fixes