Fix broken rspec.

Fixes #5466
Fix broken rspec
Merge branch '2-2-stable' into 2-2-nemo-stable