Engine: fixes #3314, 3317: Red Hat Subscriptions initial conversion
Merge pull request #3249 from bbuckingham/engine-subscriptions

Engine: fixes #3314, 3317: Red Hat Subscriptions initial conversion