Bug 549861 - add missing files from reland patch. r=bustage