Follow-up fix for bug#10027.
Follow-up fix for bug#9327.

Conflicts:

	Kernel/Output/HTML/Standard/AdminQueueResponses.dtl
	Kernel/Output/HTML/Standard/AdminResponseAttachment.dtl
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2