Fix all 9-3-stable-ee spec failures

Merged username-removed-1144264 requested to merge fix-specs into 9-3-stable-ee

What does this MR do?

Fixes 9-3-stable-ee specs.

Edited by username-removed-1144264