Merge "Fix condition for haproxy opencontrail tagdrop"