Merge pull request #3020 from krichter722/override

[STORM-3000] Add missing @Override annotations