Remove ZSRV-11843 patch because it does not work well with ZS 7.0