Fix expected content of resolving merge-keep_profile.xml

[galtm]

Committer Notes

This pull request fixes one of the expected output files in the set of sample profiles. Based on the content of the catalog whose controls are being imported, the prop names should be "label" instead of "place" and the a1 statement paragraph should include <insert>.

I also noticed a debugging message I had left in the XSLT profile resolver code inadvertently with #1321, so I'm removing that message.

All Submissions:

• Have you selected the correct base branch per Contributing guidance?
• Have you set "Allow edits and access to secrets by maintainers
  "?
• Have you checked to ensure there aren't other open Pull Requests for the same update/change?
• Have you squashed any non-relevant commits and commit messages? [instructions]
• Do all automated CI/CD checks pass?

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

Changes to Core Features:

• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your core changes, as applicable?
• Have you included examples of how to use your new feature(s)?
• Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

[wendellpiez]

@galtm thanks for the correction! @david-waltermire-nist if this PR conflicts let's discuss - with luck we'll also be visiting these files again RSN.

[aj-stein-nist]

Hi @galtm, thanks for submitting yet another excellent PR. We had to rebase develop and that leads to the "This branch has conflicts that must be resolved" conflicts below. I can help you with that, please let me know if and when you need that help. Thanks.

[galtm]

@aj-stein-nist : I resolved the merge conflicts. If anything doesn't look right to you, let me know. Thanks.

[aj-stein-nist]

Will rebase on rebased develop to include bad link correction in #1931 that is failing build (not meaningful changes of PR).

[wendellpiez]

Thanks AJ!

[aj-stein-nist]

Before approval, I will want to create a cross-reference issue to include for an upcoming patch release to identify this fix. In the interim, I will approve it as the work continues to be solid.

Thanks again, @galtm, and I appreciate your patience.