ENG-7215: merge missing query ui fixes.
Merge pull request #1804 from VoltDB/ENG-7215

ENG-7215: merge missing query ui fixes.