Relationship form/xml tweaks
Merge pull request #2635 from colemanw/master

Relationship form/xml tweaks