Merging AMPLab commits

And pushing zookeeper back down to 3.4.3 since storm has issues with 3.4.5.