Backporting fix for DS-1928 in PR#493 to DSpace 4.x
Merge pull request #574 from tdonohue/DS-1928

Backporting fix for DS-1928 in PR#493 to DSpace 4.x