UP-4221 Fix maven build issues (hopefully for good)