Merge remote-tracking branch 'upstream/master' into alt-registry-publish-wip

diff --cc src/cargo/core/manifest.rs
Simple merge

diff --cc src/cargo/ops/registry.rs
index a7e8ef82b72b89ddf5b1a5f28d0eef3257bd6ec1,d8364c28d29cfc8a2ff95d072a2508b0626f0bd3..a7e8ef82b72b89ddf5b1a5f28d0eef3257bd6ec1
mode 100755,100644..100644
--- 1/src/cargo/ops/registry.rs
--- 2/src/cargo/ops/registry.rs
+++ b/src/cargo/ops/registry.rs

diff --cc src/cargo/util/toml/mod.rs
Simple merge

diff --cc tests/publish.rs
index d4af2e99a8570f45c044cdf71fe76670caf1969a,d63087fe292456efb452fcf2ac745f8dbc91b65b..d4af2e99a8570f45c044cdf71fe76670caf1969a
mode 100755,100644..100644
--- 1/tests/publish.rs
--- 2/tests/publish.rs
+++ b/tests/publish.rs