fixes for indexing internal -- don't invoke some services, use existing services for stripping html
Merge branch 'internal-indexing-fix' into release-149