Merge "Add cis_code field to JSON-parsed XCCDF results"