Patch from Dan Scott to finish up the removal of bootstrap.conf: