Adapt _do_install_and_reboot for Rawhide user/root spoke change
    
    The user and root spokes were moved from during-install to pre-
    install hub in Rawhide. This should cope with that, while still
    working for older images.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>