fix no VPC option
sun-java state
luigi unique settings
salt state
zookeeper state
no salt master
instances pillar
fix zookeeper creation and bootstrap