Merge changes I2399960f,I7b6e1a3b into main

* changes:
  ethernet: clean up EthernetManagerTest
  ethernet: test adding listener after removing server mode iface