Use cm-10.2 branches

I've synced the cm-10.2 branches with their cm-11.0 counterparts.