Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk

Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic@capeannenterprises.com>

diff --combined .gitignore
index cbebe67bc03d5e4280f9a46cf72e41060ac4d7dc,e61f485237b6b1145e3527982d0fbbbadaf56727..d41eaeea5fa6ee53fef1dedf2e7c37440c844cfb
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -23,9 -23,7 +23,8 @@@ sdk/java/targe
  sdk/java/log
  tmp
  sdk/cli/binstubs/
- sdk/cwl/arvados_cwl/_version.py
  services/api/config/arvados-clients.yml
  *#*
  .DS_Store
  .vscode
 +.Rproj.user