ENTESB-2347: Decouple patch support from Fabric8