PLFM-2740
PLFM-2740
Merge pull request #1265 from brucehoff/PLFM-2740

PLFM-2740
PLFM-2759
Merge pull request #1266 from brucehoff/PLFM-2759

PLFM-2759
better index database cleanup
Merge pull request #1267 from john-hill/PLFM-2744

better index database cleanup
Merge pull request #1268 from marcel-blonk/PLFM-2677

Plfm 2677