Merge "O1 IP PORT configuration for CM .[Issue-Id: ODUHIGH-196]"