Merge "Add portMode configuration test" into oc-mr1-dev