Only try and populate fields that do not already have a value, and revert the field component.
Merge pull request #6591 from openscholar/6475-batch

Only try and populate fields that do not already have a value