Bring latest discovery fixes from bitbucket/ubuntu-bringup
Merge branch 'master' into dsetia_int
Merge pull request #333 from Juniper/dsetia_int

Dsetia int