cherry pick of inventory check and restart
Merge pull request #2 from blueapron/fix/2-3-dev/inventory

cherry pick of inventory check and restart