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

...written, and it leads to inconsistent behaviour after saving