replace underscores with spaces in BaseSite._username

Following bug 61832 comment 3 suggestion a)

Change-Id: Ibaa00e00bc61c734955e1377604241541eab336b
Merge "replace underscores with spaces in BaseSite._username"