bug 927707 - vcs-sync combine mapfiles, force_push. r=hwine

--HG--
extra : rebase_source : 4b44ac2e4ffe847a5c557baff78b81fc400e7f8f
bug 929080 - bump hg incoming timeout from 2min to 5min. r=hwine

--HG--
extra : rebase_source : 55e771847a6cc13d5820d0d28deb717001d2de3e
Merge remote-tracking branch 'origin/master' into vcs_multi_repo

Conflicts:
	scripts/vcs-sync/vcs_sync.py