Fix detection of pseudo conflicts on single-valued attribute changes

Pseudo-conflicts on single-valued attribute changes was populated with
the origin as the changed value even if the left/right side was
non-null.

Change-Id: Id225da76bb381a476715c9af9581cd0bc2b9e47a