WINDUP-343: Fixes for discover properties, and some other issues
Merge pull request #305 from jsight/WINDUP-343

WINDUP-343: Fixes for discover properties, and some other issues