String comparison error: "a" is not u"a", but "a" == u"a"

Unicode strings from the database were not getting compared correctly by is, resulting in conflict detection getting bypassed.