Merge "Add opencontrail:common class"