Bug 934230 - [v1.2] Update all manifest files to be in line with master