Merge "Remove defunct OSGi activators"