This was all tested and changed because of build issues such that Koji passed. Since the code changes unblock installer testing, I wanted to PR those changes by themselves. For an example (although a bit ugly) of spec + code changes see - https://github.com/ehelms/katello/commit/153b8a1a46dfaec5746646b2a6a5a2d4feac732e