backporting patch to DS-1603 to dspace 1.8
Merge pull request #263 from hardyoyo/DS-1603-backport_to_18

backporting patch to DS-1603 to dspace 1.8