Bug 974268 - Narrow the window where user and quota data can get out of sync and set the start time prior to any other collection.  Deal with a race condition with the lock files in unix_user.
Merge pull request #2867 from rmillner/misc_bugs

Merged by openshift-bot