Adding RightsHolder and RightsHeld, see #3753

The downgrade strips the xml blocks but maintains the content as comments.