Merge "Fix IndexCollection propagation into plugin guice injectors" into stable-2.15