Fix further test issues when run in container#3189

ptoscano merged 2 commits intomaincandlepin/subscription-manager:mainfrom

mhorky/ENT-5536_testscandlepin/subscription-manager:mhorky/ENT-5536_testsCopy head branch name to clipboard