Unfold add_canonical_user()

The helper hides the output XML structure.  Unfolding it makes the code a bit
easier to read.

Change-Id: I028f17d469c4d21e8ba52924dcc1be06108c0dd9
Merge "Unfold add_canonical_user()"