puppet and saltstack bootstrap changes