bug 1110343 Fix missing config.network.username

This change switches from using config.network.username to
config.identity.username. config.network.username is no longer available
it appears.

Change-Id: I6b4e445e321635a61d0e47901de9d42efb6cfe35
Merge "bug 1110343 Fix missing config.network.username"