Merge pull request #3626 from DigitalPebble/STORM-4030

[STORM-4030] Dependency upgrades