<oo-diagnostics> - Fixes for checks related to apache config

Update test_vhost_servernames to reference new filenames

Update test_broker_certificate to better detect mismatches between
ssl cert common name and apache configuration.
cleanup
Merge pull request #3300 from danmcp/master

Merged by openshift-bot
Fix runtime extended tests

Changes made to openshift-origin-cartrige-jboss{as,eap} casued the
output to change when the management interface is disabled, this fixes
the output and restores sanity to the runtime-extended tests.
Merge pull request #3283 from detiber/fixoodiag

Merged by openshift-bot
Merge pull request #3302 from detiber/fixJBawsTests

Merged by openshift-bot
Various cleanup
Merge pull request #3305 from danmcp/master

Merged by openshift-bot