Merge pull request #3534 from ethomson/index_canonicalize_fix index: canonicalize inserted paths safely