GUVNOR-2122: Fix support for null and not-null operators; together with fixes for Enums.

(cherry picked from commit d09e3ed150e87b9d190a9945a2d7ab7e6cba3090)