Merge pull request #3031 from srdo/STORM-3409

STORM-3409: Build shaded deps with dependencies, instead of as a loos…