Engine: org-switcher: updates to support working within engine

This commit contains several changes needed to enable the
org-switcher to work properly within the katello 'as an engine'.
Merge pull request #3310 from bbuckingham/engine-org_switcher

Engine: org-switcher: updates to support working within engine