whoami changes.
Merge pull request #219 from git-harry/sprint

Merged automatically by jenkins after successful gate test