fix merge conflicts

apps/calendar/appinfo/app.php

apps/calendar/js/loader.js

apps/calendar/lib/app.php

apps/calendar/lib/share.php

apps/contacts/js/contacts.js

apps/contacts/lib/hooks.php

apps/files/js/files.js

apps/files_encryption/tests/proxy.php

apps/files_external/js/dropbox.js

apps/files_external/js/google.js

apps/files_external/js/settings.js

apps/files_external/lib/webdav.php

apps/files_external/personal.php

apps/files_external/settings.php

apps/files_external/templates/settings.php

apps/gallery/lib/managers.php

apps/user_openid/appinfo/app.php

apps/user_openid/appinfo/version

apps/user_openid/class.openid.v3.php

apps/user_openid/user_openid.php