Aplied patch from LARC

This was a second patch from LARC and had to be partly applied by hand.
Merge branch 'master' into hyrax_1.9_release.

Incorporate patches for the HTML form from LARC into the release
code.