[rhel7-branch][PATCH] Do not mix two lists of fields when applying changes in text mode (#1231149)