Merge change 4228 into donut

* changes:
  Nexus: Clean up supplicant events, protocol, and continue plumbing