L2SS-260: Update SDP CPs and MPs to math the XLTR

This has been sync'ed with SDP XLTR version 2021-05-03T09.15.23_sdptr.

Closes L2SS-260

assigned to @lukken

requested review from @lukken

approved this merge request

Looks good to me, no more errors about missing attributes on SDP and PCC.

merged

mentioned in commit fd91d0e8