httpd: Fix a couple of bugs

Target: trunk
Require-notes: no
Require-book: no
Request: 2.9
Request: 2.8
Request: 2.7
Request: 2.6
Acked-by: Paul Millar <paul.millar@desy.de>
Patch: http://rb.dcache.org/r/7002/
(cherry picked from commit b6fd9b5180902583b0e59fba97d3266ecf01cb53)

Conflicts:
	modules/dcache/src/main/java/org/dcache/cells/UniversalSpringCell.java
Merge pull request #574 from gbehrmann/fix/2.6/rb7002

Fix/2.6/rb7002