Auto merge of #5466 - matklad:pr-5465, r=matklad
authorbors <bors@rust-lang.org>
Thu, 3 May 2018 10:26:59 +0000 (10:26 +0000)
committerbors <bors@rust-lang.org>
Thu, 3 May 2018 10:26:59 +0000 (10:26 +0000)
Fix target_dir handling for RLS

Supersedes  and closes #5465


Trivial merge