Added null check for haven't started case
Moved NAT-PMP and UPnP to be shutdown separately from XMPP service and bumped littleshoot version to avoid crazy stackoverflow on recursive reconnection