Fixed ERRAI-537: Jackson marshalling with Enums as map keys
Merge branch '2.3'