53871043 donorid should be on all ega samples

Also contains fixes for:
https://www.pivotaltracker.com/story/show/55879752
https://www.pivotaltracker.com/story/show/55879554
(As otherwise we have the fiddly job of merging binaries)