Created attachment 1111710 [details]
manifest.zip

Description of problem:
In satellite webUI, When enabling a repository set, it will show error info as the following, failed to enable any repo:
"There was an error attempting to enable or disable this repository:
undefined method `valid_substitutions?' for #<Katello::Util::CdnVarSubstitutor:0x0000000f8069e8>"

Version-Release number of selected component (if applicable):
Satellite-6.1.0-RHEL-7-20151218.0
katello-2.2.0.16-1.el7sat.noarch
foreman-1.7.2.50-1.el7sat.noarch
candlepin-0.9.49.9-1.el7.noarch

How reproducible:
Always

Steps to Reproduce:
1. Open satellite webUI,import the manifest in attachment
2. Go to Content--> Red Hat Repositories-->RPM, extend any Product, enable any repository

Actual results:
1. It will show error info, please see the screenshot1 in attachment.
"There was an error attempting to enable or disable this repository:
undefined method `valid_substitutions?' for #<Katello::Util::CdnVarSubstitutor:0x0000000f8069e8>"
2. As failed to enable repo, click on the "see the related failed task.", It will show "Enable" task is failed.please see the screenshot2 in attachment.
 
Expected results:
Success to enable any repo in satellite webUI

Additional info: