bug 847727 - latest vcs_sync changes. r=hwine
Merge remote-tracking branch 'origin/master' into vcs_multi_repo