Remove accepted powermock patch (powermock SVN revision 1949)
Refactor not to depend on new powermock api during compile time. Fail test during runtime if too old powermock.