Merge pull request #3298 from RuiLi8080/STORM-3663

[STORM-3663] move org.mockito.plugins.MockMaker to test level resource