Merge pull request #1481 from rickysarraf/fix-testcase-whoami

Fix testcase failure in docker environment