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

Another fix for shading issue.