Revert wrong merge in pom.xml
Revert wrong merge in pom.xml

douggie/XChange,Panchen/XChange,nopy/XChange,stachon/XChange,timmolter/XChange,TSavo/XChange,chrisrico/XChange,ww3456/XChange,andre77/XChange,LeonidShamis/XChange