Review 4.0 changes and incorporate

[greggles]

An overview of the changes is here

I think this might be worth going after the "1.3" release of the paper which would focus on 3.2 and other small fixups.

3.2.1 is still valid until 2024, so if the 1.3 updates don't happen until closer to 2024 it might make sense to go straight to 4.0:

As of the published date of this document, PCI DSS v3.2.1 is valid through 31 March 2024, after which it is retired. All PCI DSS validations
after this date must be to PCI DSS 4.0 or later.
Either PCI DSS version 3.2.1 or 4.0 can be used for assessments between March 2022 and 31 March 2024.

Quoted section is on page 36 of https://listings.pcisecuritystandards.org/documents/PCI-DSS-v4_0.pdf