bug 847727 - latest vcs_sync changes. r=hwine