am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""

* commit 'ef89e8d14619c68015103fd51ff75f82eeef8d61':
  Revert "Remove netcfg's unused options."