CMS-738 Support for persisting of Relationships when creating or updating content
Minor refactoring.