Fixed 2.16 integ test failures (#2871)

[vmmusings]

Signed-off-by: Vamsi Manohar [email protected]
(cherry picked from commit 103c416)

Description

[Describe what this change achieves]

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

• New functionality includes testing.
• New functionality has been documented.
• New functionality has javadoc added.
• New functionality has a user manual doc added.
• API changes companion pull request created.
• Commits are signed per the DCO using --signoff.
• Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.68%. Comparing base (e2683fe) to head (d0d2970).

Additional details and impacted files

@@            Coverage Diff            @@
##                2.x    #2874   +/-   ##
=========================================
  Coverage     94.68%   94.68%           
  Complexity     5202     5202           
=========================================
  Files           511      511           
  Lines         14686    14686           
  Branches        958      958           
=========================================
  Hits          13905    13905           
  Misses          740      740           
  Partials         41       41           

Flag	Coverage Δ
sql-engine	94.68% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.