Query timeout UI work
Refactor the naming part to make it more consistent
refactor the naming, be consistent with the UI on deployment file
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-6999-timeout-UI
change the source instead the copied one
Merge pull request #1724 from VoltDB/ENG-6999-timeout-UI

Query timeout UI work