CRM-15555 fix QA bug on paylater when billing option is required