Merge "Contrail 3.1.1 fix for discovery to static assignement"