Bring in last 3 necessary changes into v17.0.6-shopify1

[shivnagarajan]

This brings in the necessary two commits for v17.0.6

main vitess-build $ ruby version_builder_v2.rb --version=17.0.6 --target_branch=v17.0.6-shopify-1-candidate-update --previous_release=v16.0.7-shopify-1
The following commits are necessary for target version 17.0.6:
69e6248e0691404ff6008275f3f3c0c0de12e6fa, PR: 146
1fe7126a122320a1a76f4d83e6624fc064d24fa6, PR: 102
21ef27109f81fb4d0c8c8d2499167cf283ad2c34, PR: 107
07c6f4a9444ab5a8dc524c59bbebde0c354bfaa0, PR: 122
7fabb2df0a87ce757583e6c12c76fe9511f54e3e, PR: 128
8feee142931d3a3ebca03c0ba6ee83a5b0e78360, PR: 148
2815e0e43606984b555905735caa9c9dd0e21920, PR: 153
5cc2dfcb138ba33e0536f50957a1000900b028f7, PR: 155

The following commits have already been applied to v17.0.6-shopify-1-candidate-update:

69e6248e0691404ff6008275f3f3c0c0de12e6fa, PR: 146
1fe7126a122320a1a76f4d83e6624fc064d24fa6, PR: 102
21ef27109f81fb4d0c8c8d2499167cf283ad2c34, PR: 107
07c6f4a9444ab5a8dc524c59bbebde0c354bfaa0, PR: 122
7fabb2df0a87ce757583e6c12c76fe9511f54e3e, PR: 128
8feee142931d3a3ebca03c0ba6ee83a5b0e78360, PR: 148

git cherry-pick -x -m 1 2815e0e43606984b555905735caa9c9dd0e21920
git cherry-pick -x -m 1 5cc2dfcb138ba33e0536f50957a1000900b028f7

These commits are applied to this branch which will be merged into the v17.0.6-shopify1-candidate branch

After applying these changes.

main vitess-build $ ruby version_builder_v2.rb --version=17.0.6 --target_branch=v17.0.6-shopify-1-candidate-update --previous_release=v16.0.7-shopify-1
The following commits are necessary for target version 17.0.6:
69e6248e0691404ff6008275f3f3c0c0de12e6fa, PR: 146
1fe7126a122320a1a76f4d83e6624fc064d24fa6, PR: 102
21ef27109f81fb4d0c8c8d2499167cf283ad2c34, PR: 107
07c6f4a9444ab5a8dc524c59bbebde0c354bfaa0, PR: 122
7fabb2df0a87ce757583e6c12c76fe9511f54e3e, PR: 128
8feee142931d3a3ebca03c0ba6ee83a5b0e78360, PR: 148
2815e0e43606984b555905735caa9c9dd0e21920, PR: 153
5cc2dfcb138ba33e0536f50957a1000900b028f7, PR: 155

The following commits have already been applied to v17.0.6-shopify-1-candidate-update:

69e6248e0691404ff6008275f3f3c0c0de12e6fa, PR: 146
1fe7126a122320a1a76f4d83e6624fc064d24fa6, PR: 102
21ef27109f81fb4d0c8c8d2499167cf283ad2c34, PR: 107
07c6f4a9444ab5a8dc524c59bbebde0c354bfaa0, PR: 122
7fabb2df0a87ce757583e6c12c76fe9511f54e3e, PR: 128
8feee142931d3a3ebca03c0ba6ee83a5b0e78360, PR: 148
2815e0e43606984b555905735caa9c9dd0e21920, PR: 153
5cc2dfcb138ba33e0536f50957a1000900b028f7, PR: 155

All commits have been applied.

Description

Get v17.0.6-shopify1-candidate ready for build.

Related Issue(s)

The following commits are necessary for target version 17.0.6:
69e6248e0691404ff6008275f3f3c0c0de12e6fa, PR: 146
1fe7126a122320a1a76f4d83e6624fc064d24fa6, PR: 102
21ef27109f81fb4d0c8c8d2499167cf283ad2c34, PR: 107
07c6f4a9444ab5a8dc524c59bbebde0c354bfaa0, PR: 122
7fabb2df0a87ce757583e6c12c76fe9511f54e3e, PR: 128
8feee142931d3a3ebca03c0ba6ee83a5b0e78360, PR: 148
2815e0e43606984b555905735caa9c9dd0e21920, PR: 153
5cc2dfcb138ba33e0536f50957a1000900b028f7, PR: 155

This PR contains

2815e0e43606984b555905735caa9c9dd0e21920, PR: 153
5cc2dfcb138ba33e0536f50957a1000900b028f7, PR: 155

Checklist

• "Backport to:" labels have been added if this change should be back-ported to release branches
• If this change is to be back-ported to previous releases, a justification is included in the PR description
• Tests were added or are not required
• Did the new or modified tests pass consistently locally and on CI?
• Documentation was added or is not required

Deployment Notes

[shanth96]

LGTM

[shivnagarajan]

This also brings in PR 159

2fbde2c692500088e7be3507c3ba8e57af29bcf1, PR: 159