Bug 900522 - Follow up: Rename sync resources. r=me
Automatic merge