Backing out parameterization of OSGIServiceTracker as it causes issues when compiled for java 6, adding junit, mockito dependencies