Add email field to CloudUser
Bug 1061926 - Use lock file to prevent race between idle/unidle
Merge pull request #5192 from liggitt/user_email

Merged by openshift-bot
Merge pull request #5274 from jwhonce/bug/1061926

Merged by openshift-bot