and builds as root in that env, at least the default out of the box
experience is that for me, I suppose I could faff around getting it add a
user specifically for the build like I do for my coverity in docker
build, or just drop this.

This effectively reverts

commit 46625769
Author: Tor Lillqvist <tml@collabora.com>
Date:   Thu Apr 14 09:01:48 2016 +0300

    149

    Change-Id: I63f055756ff5f571d5ebe89aa4aee52d8ae2c510

I see your 149 and raise you a 1172

Change-Id: I3e81a725cdab1ff5ead0484dbfee11ac8fe303a9