Merge pull request #1667 from calfonso/master

Merged by openshift-bot
Improving efficiency of checks and fixing empty gear check
Additional fixes for oo-admin-chk
Add SNI upload support to API
Changed private_certificate to private_ssl_certificate
Fixed merge conflict
Bug 920801
Merge pull request #1663 from smarterclayton/cache_enable_origin

Merged by openshift-bot
Merge pull request #1666 from mrunalp/bugs/php_setup_bug

Merged by openshift-bot
Merge pull request #1668 from smarterclayton/wrong_quickstart_default

Merged by openshift-bot
Fixing fedora tests for php and mongodb
Merge pull request #1670 from kraman/test_case_fixes

Fixing fedora tests for php and mongodb
Merge pull request #1664 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #1633 from lnader/revert_pull_request_1486

Merged by openshift-bot
Adding back the get_mcs_level function for the php cartridge tests
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
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