minor changes in Manifest and OSGiTest base.

- org.hamcrest.core does not need to be a split package anymore, tycho seems to be able to build this now without any workaround
- made return of getService() method more groovy'isch