Update control mappings in consolidated rules

[dan-fedramp]

Merge revised controls arrays from control-mapping review; no other content changes.

[pete-gov]

Before merging, you'll need to do the following:

(1) Add an updated array item to the top (not bottom) of the updated array for each of the controls updated and indicate the control mappings were updated. This lets people find the exact changes without having to do a diff and keeps our updated honesty transparent.

(2) Update the top level version and last_updated fields.

also note that we don't have testing enabled on commit here, and I think if you had run the test suite it should've flagged that you didn't do (2) above, so please run the test suite first and make sure there are no errors!