Working for prodv2
Updates
Cleanup
Some other changes for minions
Updates for inventory