TRUNK-3283 - Add observation to an encounter: the field person can be overwritten, an...

...d it leads to inconsistent behaviour after saving