Merge pull request #1319 from clebertsuconic/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=1015695 - MapMessages with null properties