Ticket 33046 additional changes to a2billing