CRM-15578 - Various updates to A/B testing