Merge changes I790baf5e,I133f4861 into pi-dev

* changes:
  WifiStateMachinePrime: discard messages from old managers
  ModeManagers: do not report disabled when stopped
tree: 52f773a0ade9b586b2843a8f84424dd32940415c
  1. service/
  2. PREUPLOAD.cfg