This is a squashed version for backporting to stable branches.
IMPORTANT: It does not move XSLT_Handler to XSLT/Base as in master.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit d8bf40281b)
Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
Marcel de Rooy