Make yum repo optional (default on)
merging with upstream
Merge branch 'cernops-optional_yum_repo'