Update master for v18

[camscale]

The v17 release branch has been made, so update master so that it refers
to v18.

[aws-amplify-us-west-2]

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-47988.d3pp5qlev8mo18.amplifyapp.com

[fspmarshall]

There's a test failure here being caused by a test I wrote a while back that embedded some hard-coded state from an older version in order to test some migration logic. Consider pulling in c98815d to fix.

[camscale]

Consider pulling in c98815d to fix

@fspmarshall I've added that commit to this PR, but it does not fix the integration tests :( (perhaps it did fix one I didn't previously notice, but it was the hsm_test one that I noticed and it still fails for the same reason).

[fspmarshall]

@camscale Yeah, I didn't do a deep dive on all the failures, just fixed the one that was obviously because of a non-standard pattern I'd used in a test.