CRM-16555 include BillingBlockWrapper as part of refactoring forms to have same behaviour