A fix for the struts 0 day bug, BAU-184
Merge remote-tracking branch 'origin/dev-BAU-184' into release/2.9.18rc