Added Mockito+Powermock dependency to core pom.xml
Merge branch 'master' into webadmin_tests_unrefactored