[REF+test] clean up code for getting labels for merge screen, stdise#14260

Merged

seamuslee001 merged 2 commits intocivicrm:masterfrom eileenmcnaughton:spec

May 19, 2019

+36-48

Commits on May 17, 2019

Add unit test for handling of 'special values' when retrieving merge data

eileenmcnaughton
authored and
Eileen McNaughton
committed
[REF] code cleanup on handling on presentation of merge fields for display

eileenmcnaughton
authored and
Eileen McNaughton
committed