Added conflictingDependencies entries to maven-duplicate-finder-plugin
Merge remote-tracking branch 'viltgroup-github/master'