Bug 968834: fix `service openshift-console reload`

The openshift-console service fails to complete the reload command
successfully. This appears to be related to how the $OPTIONS variable
is expanded in the configuration syntax check conditional.

This commit is basically the openshift-console version of bugs: 902630
and 902633. Likewise, this commit fixes the unrelated issue where the
reload action does not print anything on success. Finally, this makes
some indentation uniform with surrounding statements and correctly
redirects pushd/popd output to /dev/null.
Add V2 tests for switchyard
Bug 968882 - Fix MIMEMagicFile

* httpd*conf files did not match where magic file was located
Fix failing runtime_extended test
Merge pull request #2694 from pmorie/dev/v2_switchyard

Merged by openshift-bot
Merge pull request #2696 from jwhonce/bug/968882

Merged by openshift-bot
Force sync to disk prior to renaming the file for additional safety.
Bug 969112 - RFC 1121 (sect 2.1) specifies that a host name must start with a letter or number.
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.9.8-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.9.10-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.4.9-1].
Automatic commit of package [openshift-origin-broker-util] release [1.9.7-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.2.7-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [0.4.8-1].
Automatic commit of package [openshift-origin-cartridge-php] release [0.4.8-1].
Automatic commit of package [openshift-origin-node-util] release [1.9.8-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [0.4.6-1].
Automatic commit of package [openshift-origin-cartridge-python] release [0.4.7-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.9.10-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.9.10-1].