Fixing optional scl macros in rubygem-openshift-origin-common
Merge pull request #2786 from kraman/f19_fixes

Merged by openshift-bot