LP#1666512 - Add billing types from 2009-era features.