Merge pull request #3051 from srdo/STORM-3435

STORM-3435: Use Jetty BOM