Import zookeeper version 1.4.6
Import java version 1.13.0
Import windows version 1.10.0
Import chef_handler version 1.1.4
Import build-essential version 1.4.2
More cleanup and tweaks
fixing merge