Reverted back to using salt-bootstrap to bootstrap salt