Backport for 0.18: Fix for XContentMapConverter with nulls in arrays

(sorry fluffed that last one!)