Eng 6428 - Review only.wait for merge till System tests have run.

I think the second condition covers the first.