Auto merge of #5175 - matklad:conv, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 14 Mar 2018 18:00:32 +0000 (18:00 +0000)
committerbors <bors@rust-lang.org>
Wed, 14 Mar 2018 18:00:32 +0000 (18:00 +0000)
Use conventions to specify the integration tests


Trivial merge