FORGE-2065: CDI commands should have implicit setup
Merge pull request #514 from agoncal/FORGE-2065

FORGE-2065: CDI commands should have implicit setup