Backport fix for EDAlias and failing edm::Refs
Merge pull request #931 from Dr15Jones/backportEDAliasRefFixTo6_2_X

Backport EDAlias anf failed edm::Ref fix to 6_2_X