Fixed build problems after inclusion of powermock from merge from 3.4-dev
2 files changed