deermine issue :44112
Merge branch 'master' of https://github.com/deerwalk/voltdb

Conflicts:
	src/frontend/org/voltdb/dbmonitor/index.htm
	src/frontend/org/voltdb/dbmonitor/js/voltdb.core.js
	src/frontend/org/voltdb/dbmonitor/js/voltdb.ui.js