Merge pull request #943 from xtuple/master

Merge master into billing
Merge remote-tracking branch 'XTUPLE/billing' into 21614
Issue #21514: Added startup file to billing