don't use cpp definition index if it hasn't been initialized
Merge branch 'master' of github.com:rstudio/rstudio