Merge "update netcfg to use prefixLength not netmask"