SOLR-5777: Fix ordering of field values in JSON updates where field name key is repeated (merged branch_4x r1572271)