Cleanup ande several discovery issues resolved. Sometimes discovery does
not happen before restarting the discovery on time out.