Update rhel6.patch to match other changes