INT-1807: Rebased and polished

Change `MapJsonSerializer` to use `JsonObjectMapper` abstraction