<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.
Merge pull request #3283 from detiber/fixoodiag

Merged by openshift-bot