Close indexes as they are removed from the IndexCollection

Change-Id: I71cf370be094ae1eba73b2dec9e0dfec3b9a5c09
3 files changed