Modified to wait longer for igd discovery on shutdown to avoid crashing some igds and other cleanups fixes #772