Change null safe equals check to Guava implementation

This to be able to compile for Java 1.6