Merge "Fix NPE when scanning change index versions if 'index' dir is missing"