ISTWCMS-3947: removing cbl modules and adding uw_custom_blocks

composer.json

@@ -129,31 +129,18 @@
         "symfony/phpunit-bridge": "*",
         "symfony/var-dumper": "^4.0",
         "wcms/uw_auth_wcms_admins": "dev-8.x-1.x",
-        "wcms/uw_cbl_blockquote": "dev-8.x-1.x",
-        "wcms/uw_cbl_call_to_action": "dev-8.x-1.x",
-        "wcms/uw_cbl_copy_text": "dev-8.x-1.x",
-        "wcms/uw_cbl_expand_collapse": "dev-8.x-1.x",
-        "wcms/uw_cbl_facebook": "dev-8.x-1.x",
-        "wcms/uw_cbl_facts_and_figures": "dev-8.x-1.x",
-        "wcms/uw_cbl_image": "dev-8.x-1.x",
-        "wcms/uw_cbl_instagram": "dev-8.x-1.x",
-        "wcms/uw_cbl_mailman": "dev-8.x-1.x",
-        "wcms/uw_cbl_multi_type_list": "dev-8.x-1.x",
-        "wcms/uw_cbl_remote_video": "dev-8.x-1.x",
-        "wcms/uw_cbl_special_alert": "dev-1.0.x",
-        "wcms/uw_cbl_tableau": "dev-8.x-1.x",
-        "wcms/uw_cbl_twitter": "dev-8.x-1.x",
         "wcms/uw_cfg_common": "dev-8.x-1.x",
         "wcms/uw_ct_blog": "dev-8.x-1.x",
         "wcms/uw_ct_event": "dev-8.x-1.x",
         "wcms/uw_ct_news_item": "dev-8.x-1.x",
         "wcms/uw_ct_site_footer": "dev-8.x-1.x",
         "wcms/uw_ct_web_page": "dev-8.x-1.x",
+        "wcms/uw_custom_blocks": "dev-8.x-1.x",
         "wcms/uw_dashboard": "dev-8.x-1.x",
         "wcms/uw_fdsu_theme_resp": "dev-8.x-1.x",
         "wcms/uw_media": "dev-8.x-1.x",
         "wcms/uw_site_dev": "dev-8.x-1.x",
-        "wcms/uw_sites_all": "dev-8.x-1.x",
+        "wcms/uw_sites_all": "dev-8.x-1.x-ISTWCMS3947-content-merge",
         "wcms/uw_theme_admin": "dev-8.x-1.x",
         "wikimedia/composer-merge-plugin": "^1.4"
     },