Bug 934161 - [v1.2] Update marketplace test and manifest to be in line with master