Bug 947098 fix - add margin to h3 so icon doesn't overlap at narrow resolutions
Fix how erb binary is resolved. Using util/util-scl packages instead of doing it dynamically in code.
Separating manifest into RHEL and Fedora versions instead of using sed to set version.
Merge pull request #1875 from sg00dwin/401dev

Merged by openshift-bot
Merge pull request #1860 from kraman/php_v2

PHP V2 cartridge fixes
Consolidating ssh key name manipulation in one place