turn on v2 billing (bug 1016112)
Merge pull request #488 from andymckay/1016112-stage

turn on v2 billing (bug 1016112)