Merge "[SDNC] Fix sdnrdb discovery issue"