XML: upgrade-2.10.xsl: cluster options [2/3]: {op,rsc}_defaults move

See commit 642a09b22, 0c03e366d, a28a558f9.
Make sure not to override any (opportunistically) preexisting settings.

Also further refine allowed cluster_property_set/nvpair/@name to
those beside the just-dropped (because of move) items as encoded
in the upgrade map.