There is still a lot of places that need either an Authority or still
an actual User object. This patch changes the usages that can be
changed right now (almost) without any codechange.
The only additional change is the removal of an unused constructor
argument.
Change-Id: I0fbb3c2cc4cea7fba135d92b04421b0563c0f0c8