Resolved ERRAI-565: nested maps with certain combinations of key types are not demarshallable
Fixed several bugs in entitiy comparator; added lots of tests for cases that were failing