Squashed commit of the following: Fixes
commit 441e39ce79fad4a01fc08dc5c50a4284c46ff843
    Corrected the value of current server by reading it from the host header.
commit 03379a8ef5da50deef1995f3ee79c0d625292096
    Merge branch 'master' of https://github.com/deerwalk/voltdb
commit 349fc0786f15c805076a6edb89edbaf45f6181a8
    code refactor related to issue:47160
commit aba2ec3190fe207f70359dd9f1ceee5d8944538a
    ENG-7060: fix template to include scripts so that standalone catalog-report.html works.
ENG-7060: Make standalone report work.
Merge pull request #1818 from VoltDB/ENG-7060

ENG-7060: Make standalone report work.
Merge remote-tracking branch 'upstream/master'