Fix logout button and welcome message

Change-Id: I1e4fda786ec4a785925178e59898b5f991dc8d39
Merge remote-tracking branch 'origin/master' into deployment

a83ba0008ebfbbdb8a26b7925461 Fix logout button and welcome message

Change-Id: Icf6aa1b415f2add7435ecbb72d0816b719142e77