Fix deadlock in discovery sample#795

sfod merged 5 commits into

mainaws/aws-iot-device-sdk-cpp-v2:mainfrom

fix-basic-discoveryaws/aws-iot-device-sdk-cpp-v2:fix-basic-discoveryCopy head branch name to clipboard