Merge pull request #3095 from srdo/STORM-3478

STORM-3478: Upgrade to JUnit 5.5.1 and Mockito 3.0.0