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