Merge "add changes for opencontrail"