Issue #2700491 by er.pushpinderrana, jhodgdon: getFieldMap() should state that bundle array has matching keys and values (cherry picked from commit 95338351)