Bonbos pr with 1838 merged

The latest PR that allows all specs to run clean. Line item promo stuff doesn't work correctly yet, but since we don't allow line level promos in Nemo, the failing specs have pended.