Update docserver build process for zenweb (refs #1786)
Merge branch 'master' of git.clinicalfuture.com:arvados