What problem does this code solve?
Refactor JSONObject populateMap(), per #984.

Note: There is an outstanding comment. If the submitter can't make the update, the code will be merged anyway, and I will add a follow-up PR to fix it.

Does the code still compile with Java6?
Yes

Risks
Low

Changes to the API?
No

Will this require a new release?
No

Should the documentation be updated?
No

Does it break the unit tests?
No

Was any code refactored in this commit?
Yes, that was why the issue was created.

Review status
APPROVED

Starting 3-day comment window