only require pam headers/libraries in server mode
Merge branch 'master' of github.com:rstudio/rstudio
eliminate legacy non-encoding codepaths for knit
Merge remote-tracking branch: upstream/master