2.1.x 3486022 phpunit failing

Ted Cooperrequested to merge
issue/genpass-3486022:2.1.x-3486022-phpunit-failing into 2.1.x

Not to be merged without removing anything not relevant to the fix.

Merge request reports