Merge changes I59564c2e,I3f77cedb into main

* changes:
  Do not treat router MAC changes as failures, except after roam.
  Add an integration test to verify NUD failure due to router MAC changes.