fix handling for multiple dfs data dirs; add bigtop fix to zookeeper state