Merge "Add default values for opencontrail stats + fix OC tag"