4.5 upgrade failure on line_item
Merge pull request #3411 from monishdeb/upgrade-fix

4.5 upgrade failure on line_item