Cherry Pick of AWS Performance into 0.18 Release

Marc Burnie [AWS]requested to merge
cherry-pick-aws-release-0.18 into release/0.18

Cherry pick of: !678 (merged)

Fixes issues: osdu/platform/pre-shipping#298 osdu/platform/pre-shipping#343

Also fixes failing integration tests for AWS due to timeout.

Merge request reports