Merge "Rationalize Cassandra and Zookeeper dashboards"