Make user name more generic

We are not using the user only for upload wizard tests any more.

Change-Id: Ic50660e1ffcc3eea5c0f76a70a6c9f4cdde2198f