0.38.x - no longer restarting cleanly after upgrade (AIO installer)

With 0.35 (which is where I started) HA didn’t restart cleanly and was killed by systemd instead of shutting down. With 0.37 (and possibly 0.36, can’t remember) that problem went away. Now with 0.38(.1) it’s back:

Feb 12 10:55:49 jarvis systemd[1]: Stopping Home Assistant...
Feb 12 10:55:49 jarvis hass[8221]: 17-02-12 10:55:49 INFO (MainThread) [homeassistant.core] Bus:Handling <Event homeassistant_stop[L]>
Feb 12 10:55:49 jarvis hass[8221]: 17-02-12 10:55:49 INFO (Thread-7) [homeassistant.components.zwave] Stopping ZWave network.
Feb 12 10:55:49 jarvis hass[8221]: 17-02-12 10:55:49 INFO (Thread-7) [openzwave] Stop Openzwave network.
Feb 12 10:57:20 jarvis systemd[1]: home-assistant.service stop-sigterm timed out. Killing.
Feb 12 10:57:20 jarvis systemd[1]: home-assistant.service: main process exited, code=killed, status=9/KILL
Feb 12 10:57:20 jarvis systemd[1]: Unit home-assistant.service entered failed state.
Feb 12 10:57:20 jarvis systemd[1]: Starting Home Assistant...

That’s the same config as with 0.37.1, having upgraded using the standard AIO upgrade process.

And typically, it restarts cleanly now.