Fix #2310, Update XML files per interoperability testing

[jphickey]

Checklist (Please check before submitting)

• I reviewed the Contributing Guide.
• I signed and emailed the appropriate Contributor License Agreement to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

Describe the contribution
Verify the JSON files generated from EDS match the expected content and CTF-based tests also pass. This required a few touchups to XML files to adjust sizes and/or padding.

Fixes #2310

Testing performed
Convert EDS to JSON and run CTF-based tests using generated files

Expected behavior changes
None

System(s) tested on
CTF

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.