Fix and unpend specs currently failing with :combined_menu flag on (take 2) See merge request gitlab-org/gitlab!62715