Merge "Contrail 3.1.1 fix for discovery to static assignement" into release/2019.2.0