Support additional control-origination props #784

[Compton-US]

Committer Notes

Based on the request in #784, extended the xpath to include control-origination props for:

implemented-requirement/prop
implemented-requirement/by-component/prop
implemented-requirement/statement/prop
implemented-requirement/statement/by-component/prop

The updated xpath selected the following paths from my test case:

" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/prop[1]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/prop[2]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/prop[3]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/statement[1]/prop[1]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[1]/statement[2]/by-component[1]/prop[1]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[2]/prop[1]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[2]/prop[2]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[2]/prop[3]/@name",
" /system-security-plan[1]/control-implementation[1]/implemented-requirement[2]/by-component[1]/prop[1]/@name",

A note was added that the child context will override the parent control-origination.

[aj-stein-nist]

I know Dave has the final sign-off, but I did review (as part of the assigned group for the issue) and looks all good to me (barring the broken link, but there is a separate PR to fix that against develop as discussed last week).

[aj-stein-nist]

@Compton-NIST if you pull in from current develop as of this morning, the link check tests will pass. Thanks for your help late last week.