Get rid of local-username and faffing around with impersonator tag.
Merge in default.
Merge bug25985