More fixes to provisioning process
Use pre-bootstrap.sh to tee stdout to log as well
Revert back to preanswering in bootstrap.sh