Merge "Backport patches needed for 2018.11.0 and 3-2 contrail" into 2018.11.0