fixing functional tests of users controller
Merge branches 'ActionItem2882' and 'stable' into stable