Ref #3948 - can't update user
Merge pull request #23 from mbacovsky/3948_update_user

Ref #3948 - can't update user
Fixes needed to get our Jenkins job running
Merge pull request #31 from daviddavis/temp/20140122163759

Fixes needed to get our Jenkins job running