HSEARCH-1727 Restore original package name for SearchFactory, break inhe...

...ritance link with SearchFactoryIntegrator