move a2billing tariff and prepaid options to package def, #24572, #24574