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
Merge pull request #1673 from kraman/test_case_fixes

Disable cartridge-php.feature on Fedora due to hard coded assumptions about RHEL paths
Adding permission related support for cartridge-php tests
Merge pull request #1674 from kraman/test_case_fixes

Merged by openshift-bot
Pry console won't start in console app
Merge pull request #1675 from smarterclayton/pry_wont_work_for_console

Merged by openshift-bot
Bug 922650: Fix default ROOT.war for JBoss carts

Fix erroneous absolute paths introduced into the default ROOT.war for
new JBoss cartridge applications.
Merge pull request #1677 from ironcladlou/bz/922650

Merged by openshift-bot