UHM-980 - Added additional encounter roles to row-per-encounter data export, and added tests for disposition column