Merge pull request #1671 from kraman/test_case_fixes

Merged by openshift-bot
Removing hack for separating id from format in keys controller
Merge pull request #1672 from abhgupta/abhgupta-dev

Merged by openshift-bot
Disable cartridge-php.feature on Fedora due to hard coded assumptions about RHEL paths