merge upstream

Author: hhermanwang

CHANGELOG.md

@@ -5,13 +5,10 @@ ENHANCEMENTS:
 * Resource: `tencentcloud_clb_listener` add computed argument `listener_id`.
 * Resource: `tencentcloud_clb_listener_rule` support import.
 * Resource: `tencentcloud_cdn_domain` add example that use COS bucket url as origin.
-* Data Source: `tencentcloud_instance_types` add argument `exclude_sold_out` to support filtering sold out instance types. 
-
-ENHANCEMENTS:
-
 * Resource: `tencentcloud_sqlserver_instance` add new argument `tags`.
 * Resource: `tencentcloud_sqlserver_readonly_instance` add new argument `tags`.
 * Resource: `tencentcloud_elasticsearch_instance` support nodeType and diskSize modification.
+* Data Source: `tencentcloud_instance_types` add argument `exclude_sold_out` to support filtering sold out instance types. 
 * Data Source: `tencentcloud_sqlserver_instances` add new argument `tags`.
 
 BUG FIXES: