orion pushed to cobbler (epel7). "Merge branch 'master' into epel7"