master
now that the kbfs repo is merged, move packaging to main packaging dir (#15727)
Systemd only stop main electron process on stop (#17322)
use consistent envfile directory (#15757)