Crm 11534

Fixes to allow WebTest_Contribute_AddPricesetTest to complete. Includes a markup change in Set.tpl (eliminate duplicate id value).