Auto merge of #4687 - matklad:rust-1.22.0-backport, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 31 Oct 2017 15:22:31 +0000 (15:22 +0000)
committerbors <bors@rust-lang.org>
Tue, 31 Oct 2017 15:22:31 +0000 (15:22 +0000)
[beta] Don't update lockfiles from previous Cargo versions if `--locked` is passed


Trivial merge