With the latest changes in Equinox o.e.osgi.util was replaced by the
corresponding 'original' OSGi-reference bundles that are
required+reexported by o.e.osgi.util. Unfortunately the re-export does
not help in this product launch. Therefore o.e.osgi.util is replaced by
the actually needed plug-ins.

And apply one minor code improvement in TestPDETemplates.

Fixes https://github.com/eclipse-pde/eclipse.pde/issues/55