Merge "Softflac: enumerate port format" into oc-mr1-dev