Resolve conflicts after cherry-pick from autosave branch.
Commented out one extra test printline used with Verification Grouping.
Merge branch 'dev' of github.com:nysenate/InventoryWebApp.git into dev