Merge "client IP/port definition in configuration separation new netconf.client prope...