Fixing optional scl macros in rubygem-openshift-origin-common [merge]