Avoid shading of org.joda.convert package, fixes #3557