Merge pull request #797 from brucehoff/PLFM-2312

PLFM-2312
EZID down
Merge pull request #799 from xschildw/ezidint-ignore

EZID down
Merge branch 'release-20' into develop