fix some conflicts that for some reason weren't resolved during the last cherry-picks
-rw-r--r-- 105 .gitignore
drwxr-xr-x - buildbot
drwxr-xr-x - citadel
drwxr-xr-x - contrib
drwxr-xr-x - ctdlphp
drwxr-xr-x - ctdlsalearn
drwxr-xr-x - ctdlsh
drwxr-xr-x - libcitadel
drwxr-xr-x - webcit