BZ876324 resolve ServerName/NameVirtualHost situation for node/broker/ssl.conf
add oo-diag tests for: chkconfig services missing, quota bug, rogue vhost. also abortok flag.
Merge pull request #1120 from sosiouxme/BZ876324

Merged by openshift-bot
Merge branch 'master' of github.com:openshift/origin-server