Resolve conflicts

modules/cdc/config-templates/module_cdc.php

modules/cdc/default-disable

modules/cdc/lib/Auth/Process/CDC.php

modules/cdc/lib/Client.php

modules/cdc/lib/Server.php

modules/cdc/www/resume.php

modules/cdc/www/server.php

modules/oauth/config-template/module_oauth.php

modules/oauth/default-disable

modules/oauth/hooks/hook_cron.php

modules/oauth/hooks/hook_frontpage.php

modules/oauth/lib/Consumer.php

modules/oauth/lib/OAuthServer.php

modules/oauth/lib/OAuthStore.php

modules/oauth/lib/Registry.php

modules/oauth/libextinc/LICENSE.txt

modules/oauth/libextinc/OAuth.php

modules/oauth/templates/registry.edit.tpl.php

modules/oauth/templates/registry.edit.twig

modules/oauth/templates/registry.list.php