Split patch files, manual remove of s3/hadoop/vsphere support