Digression: it would be nice to use /etc/environment.d to set the extra env vars we need, but that's not as easy as it seems. For starters, Xenial does not support it. Then we have to remember that /etc/environment is a PAM thing (pam_env), while /etc/environment.d is a systemd thing and those settings apply to systemd service environments (see environment.d(5)), so it's not obvious as all that /etc/environment assignments can be moved under /etc/environment.d.
LGTM, thanks!
---
Digression: it would be nice to use /etc/environment.d to set the extra env vars we need, but that's not as easy as it seems. For starters, Xenial does not support it. Then we have to remember that /etc/environment is a PAM thing (pam_env), while /etc/environment.d is a systemd thing and those settings apply to systemd service environments (see environment.d(5)), so it's not obvious as all that /etc/environment assignments can be moved under /etc/environment.d.