Merge pull request #1 from rzo1/STORM-4030

Fix licenses, remove duplicates by dependency management