Merge branch 'stable-3.5' into stable-3.6 * stable-3.5: Revert "Accept remotes without `fetch` option on primary" Change-Id: Ie63d15b02ac6a61850eabf1b57a5e5022f3cc179