DO NOT MERGE: Engine: changes resulting from engine branch rebase with devel

Team,

This PR isn't intended to be merged.  It is simply to get feedback/ack/nack on the changes that needed to be applied after rebasing the engine branch on devel.  Once acked, I'll push the resulting 'engine-rebase_devel' to 'engine'.  

Since this PR will block getting folks developing from the engine branch, I'd like to request feedback be received by noon EST Monday 11/25

Please refer to the commits included for details on the changes.   Also, be aware that as part of the rebase, there were many conflicts that had to be manually resolved (~80).  

After the rebase and the changes below, aside from getting test:katello to run clean, I did run through some basic UI regression testing including:
- create org, env
- create product/repo/provider
- import manifest
- enable redhat repos
- create sync plan/schedule
- sync repo
- create content view definition, add content to it and publish view
- promote content view
- review content via content search
- create system group
- create activation key

thanks,
Brad