ISTWCMS-5258: Clean-up patches

Liam Morlandrequested to merge
feature/ISTWCMS-5258-lkmorlan-remove-patches into 3.1.x

Merge request reports