pull catalogs and manifests from file system and add machine_detail_manifests#18

SoxIn4 wants to merge 6 commits intosalopensource:mastersalopensource/sheagcraig_sal_plugins:masterfrom

SoxIn4:masterSoxIn4/sheagcraig_sal_plugins:masterCopy head branch name to clipboard