Fixed ERRAI-811: Marshalling a Map containg null keys creates invalid json