GATEWAY-3413 regression suite modifications from RC-1 run