Commit fails with "Validation Error: panorama -> log-settings -> hipmatch unexpected here" after switching mode from legacy to Panorama mode

• Panorama VM changed from legacy mode to Panorama mode,
• The following Commit fails with error below: 

Can't commit changes to Panorama.
Validation Error
panorama -> log-settings -> hipmatch unexpected here
panorama -> log-settings is invalid

• VM Panorama in Panorama mode.
• Supported PAN-OS

• Validation fails with the above error message because hipmatch is no longer a configuration option under Panorama > Log Settings once you have migrated to Panorama mode.
• The previous configuration was not removed from the XML config file causing the validation error because it could not find the previous location.

1. Export Candidate configuration from GUI: Panorama > Setup > Operations > Export named Panorama Configuration snapshot and save the file to your machine.
2. Use Notepad++ or XML editor to edit the exported candidate configuration and remove the below entries that are highlighted.

           <config>
            <shared>
              <log-settings>
                <hipmatch>
                  <match-list>
                    <entry name="TEST">
                      <filter>All Logs</filter>
                    </entry>
                  </match-list>
                </hipmatch>
              </log-settings>
            </shared>
          </config>

3. From Panorama GUI: Device > Setup > operations, Import then load your custom Panorama candidate-config.
4. Validate/Commit any changes and commit will be successful.