UP-4163 Fix maven build issues