Backport default options from CM7.x upstream

Enable "sync -c" default for repo
also enables "sync -j4" default for repo

(I'm backporting this now because the time has come for me to make
other changes to the manifest anyway.)