Fix some flaky tests on the buildbots
auto merge of #408 : alexcrichton/cargo/fix-master, r=alexcrichton