Adds Linux discovery to Discovery.cpp
Update Makefile to build correctly on Linux.
Finish device discovery on Linux.
Fix an issue where tests for Windows helper functions would try to run on Linux.
Merge remote-tracking branch 'remotes/origin/linuxdisco'

Conflicts:
	cli/Makefile
	cli/src/Discovery.cpp