phluid61 backport tweaks to EPrints::Apache from 3.4