Update "infrastructure" command logic/add various fixes#761

forstmeier merged 4 commits intomasteroscmcompany/fund:masterfrom

infrastructure-fixes-and-cleanuposcmcompany/fund:infrastructure-fixes-and-cleanupCopy head branch name to clipboard