Fix bug 1029745: billing info form
Merge pull request #4183 from liggitt/bug_1029745_billing_info_form

Merged by openshift-bot