Merge "refactor opencontrail params"