Further work on chef bootstrap support