CIDEVSTC-306: Discovery enhancements
Bumped submodules
Fixed UNIT test failures
Merge pull request #2132 from mmeisinger/add306_disc

CIDEVSTC-306: Discovery enhancements