SYNC-1251 - Remove old PWC entries and add new entries with correct type
SYNC-1251 - SF
SYNC-1251 match order in service.xml
SYNC-1251 - Regen