Simplified Model::mergeRow

This way a developer only needs to override setRow() to handle all fields
CS
Merge pull request #6308 from aschempp/pullrequests/model-mergeRow