Merge "[ESR] Force esr-server to run as non-root"