Formatted.
Changed so that owner is source, rather than the delegate, when in
delegation mode.
Merge branch 'fixMergeProblemWithIntegrationTests' into makeOwnerTheSourceForChangesByDelegate
Merge pull request #1584 from ORCID/makeOwnerTheSourceForChangesByDelegate

Make owner the source for changes by delegate