Backport from trunk: #9387 Fix NPE on null values in Map entries
Backport from trunk: #9387 Fix NPE on null values in Map entries

git-svn-id: 410459702e6123a874d92574e1336b0959d85891@10480 2913f559-6b04-0410-9a09-c530ee9f5186

gxa/gxa,gxa/gxa,gxa/gxa,gxa/gxa,gxa/gxa