Remove :org from Contact change attributes.

Nominet doesn't allow the organisation name to be changed.
Fix some XML generation errors.