Merge "bug 1110343 Fix missing config.network.username"