Correct unit on the Y axis for Zookeeper watch count

Fixes PROD-34649

Change-Id: I949e8d4956e7241fc0c691f6c6528709a15a40b2
diff --git a/opencontrail/files/grafana_dashboards/zookeeper_prometheus.json b/opencontrail/files/grafana_dashboards/zookeeper_prometheus.json
index 094f000..1991f1d 100644
--- a/opencontrail/files/grafana_dashboards/zookeeper_prometheus.json
+++ b/opencontrail/files/grafana_dashboards/zookeeper_prometheus.json
@@ -1716,7 +1716,7 @@
       },
       "yaxes": [
         {
-          "format": "ms",
+          "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -2031,4 +2031,4 @@
   "uid": null,
   "version": 33
 }
-{% endraw %}
\ No newline at end of file
+{% endraw %}
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index a600206..8e70bed 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -38,6 +38,7 @@
     virtualenv $VENV_DIR
     source ${VENV_DIR}/bin/activate
     python -m pip install salt${PIP_SALT_VERSION}
+    python -m pip install 'msgpack<1.0.0'
 }
 
 setup_pillar() {