Wjohnson dev discovery

William Johnsonrequested to merge
wjohnson-dev-discovery into master

Modified discovery code to properly add message type to control port message.

Merge request reports