Reboot capability should fix symlinks

This cleans up some of the duplication and guest branching in the provisioners.