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

Backport Fix for EDAlias and failing edm::Refs