intermediate changes

ref:ebdff8c3d54500ffd2411bb148bf63da1d0f4b77

4 files changed, 148 insertions, 164 deletions

diff --git a/contrib/python/boto3/py2/patches/02-fix-yamake.patch b/contrib/python/boto3/py2/patches/02-fix-yamake.patch
index ad43a9c1d7f..f18bb7a4526 100644
--- a/contrib/python/boto3/py2/patches/02-fix-yamake.patch
+++ b/contrib/python/boto3/py2/patches/02-fix-yamake.patch
@@ -18,10 +18,9 @@
      boto3/data/ec2/2016-09-15/resources-1.json
      boto3/data/ec2/2016-11-15/resources-1.json
 -    boto3/data/glacier/2012-06-01/resources-1.json
--    boto3/data/iam/2010-05-08/resources-1.json
--    boto3/data/opsworks/2013-02-18/resources-1.json
 +    #boto3/data/glacier/2012-06-01/resources-1.json
-+    #boto3/data/iam/2010-05-08/resources-1.json
+     boto3/data/iam/2010-05-08/resources-1.json
+-    boto3/data/opsworks/2013-02-18/resources-1.json
 +    #boto3/data/opsworks/2013-02-18/resources-1.json
      boto3/data/s3/2006-03-01/resources-1.json
 -    boto3/data/sns/2010-03-31/resources-1.json
diff --git a/contrib/python/boto3/py3/patches/02-fix-yamake.patch b/contrib/python/boto3/py3/patches/02-fix-yamake.patch
index a858c0e7684..cc2cbf0672b 100644
--- a/contrib/python/boto3/py3/patches/02-fix-yamake.patch
+++ b/contrib/python/boto3/py3/patches/02-fix-yamake.patch
@@ -18,10 +18,9 @@
      boto3/data/ec2/2016-09-15/resources-1.json
      boto3/data/ec2/2016-11-15/resources-1.json
 -    boto3/data/glacier/2012-06-01/resources-1.json
--    boto3/data/iam/2010-05-08/resources-1.json
--    boto3/data/opsworks/2013-02-18/resources-1.json
 +    #boto3/data/glacier/2012-06-01/resources-1.json
-+    #boto3/data/iam/2010-05-08/resources-1.json
+     boto3/data/iam/2010-05-08/resources-1.json
+-    boto3/data/opsworks/2013-02-18/resources-1.json
 +    #boto3/data/opsworks/2013-02-18/resources-1.json
      boto3/data/s3/2006-03-01/resources-1.json
 -    boto3/data/sns/2010-03-31/resources-1.json
diff --git a/contrib/python/botocore/py2/patches/04-fix-yamake.patch b/contrib/python/botocore/py2/patches/04-fix-yamake.patch
index 4a1fbc2d4a0..534a7aeae1a 100644
--- a/contrib/python/botocore/py2/patches/04-fix-yamake.patch
+++ b/contrib/python/botocore/py2/patches/04-fix-yamake.patch
@@ -719,10 +719,65 @@
 -    botocore/data/honeycode/2020-03-01/paginators-1.json
 -    botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
 -    botocore/data/honeycode/2020-03-01/service-2.json
--    botocore/data/iam/2010-05-08/examples-1.json
--    botocore/data/iam/2010-05-08/paginators-1.json
--    botocore/data/iam/2010-05-08/service-2.json
--    botocore/data/iam/2010-05-08/waiters-2.json
++    #botocore/data/es/2015-01-01/examples-1.json
++    #botocore/data/es/2015-01-01/paginators-1.json
++    #botocore/data/es/2015-01-01/service-2.json
++    #botocore/data/events/2014-02-03/service-2.json
++    #botocore/data/events/2015-10-07/examples-1.json
++    #botocore/data/events/2015-10-07/paginators-1.json
++    #botocore/data/events/2015-10-07/service-2.json
++    #botocore/data/finspace-data/2020-07-13/paginators-1.json
++    #botocore/data/finspace-data/2020-07-13/service-2.json
++    #botocore/data/finspace/2021-03-12/paginators-1.json
++    #botocore/data/finspace/2021-03-12/service-2.json
++    #botocore/data/firehose/2015-08-04/examples-1.json
++    #botocore/data/firehose/2015-08-04/paginators-1.json
++    #botocore/data/firehose/2015-08-04/service-2.json
++    #botocore/data/fis/2020-12-01/paginators-1.json
++    #botocore/data/fis/2020-12-01/service-2.json
++    #botocore/data/fms/2018-01-01/examples-1.json
++    #botocore/data/fms/2018-01-01/paginators-1.json
++    #botocore/data/fms/2018-01-01/service-2.json
++    #botocore/data/forecast/2018-06-26/paginators-1.json
++    #botocore/data/forecast/2018-06-26/service-2.json
++    #botocore/data/forecastquery/2018-06-26/paginators-1.json
++    #botocore/data/forecastquery/2018-06-26/service-2.json
++    #botocore/data/frauddetector/2019-11-15/paginators-1.json
++    #botocore/data/frauddetector/2019-11-15/service-2.json
++    #botocore/data/fsx/2018-03-01/paginators-1.json
++    #botocore/data/fsx/2018-03-01/service-2.json
++    #botocore/data/gamelift/2015-10-01/examples-1.json
++    #botocore/data/gamelift/2015-10-01/paginators-1.json
++    #botocore/data/gamelift/2015-10-01/service-2.json
++    #botocore/data/glacier/2012-06-01/examples-1.json
++    #botocore/data/glacier/2012-06-01/paginators-1.json
++    #botocore/data/glacier/2012-06-01/service-2.json
++    #botocore/data/glacier/2012-06-01/waiters-2.json
++    #botocore/data/globalaccelerator/2018-08-08/paginators-1.json
++    #botocore/data/globalaccelerator/2018-08-08/service-2.json
++    #botocore/data/glue/2017-03-31/examples-1.json
++    #botocore/data/glue/2017-03-31/paginators-1.json
++    #botocore/data/glue/2017-03-31/service-2.json
++    #botocore/data/greengrass/2017-06-07/paginators-1.json
++    #botocore/data/greengrass/2017-06-07/service-2.json
++    #botocore/data/greengrassv2/2020-11-30/paginators-1.json
++    #botocore/data/greengrassv2/2020-11-30/service-2.json
++    #botocore/data/groundstation/2019-05-23/paginators-1.json
++    #botocore/data/groundstation/2019-05-23/service-2.json
++    #botocore/data/guardduty/2017-11-28/paginators-1.json
++    #botocore/data/guardduty/2017-11-28/service-2.json
++    #botocore/data/health/2016-08-04/examples-1.json
++    #botocore/data/health/2016-08-04/paginators-1.json
++    #botocore/data/health/2016-08-04/service-2.json
++    #botocore/data/healthlake/2017-07-01/paginators-1.json
++    #botocore/data/healthlake/2017-07-01/service-2.json
++    #botocore/data/honeycode/2020-03-01/paginators-1.json
++    #botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
++    #botocore/data/honeycode/2020-03-01/service-2.json
+     botocore/data/iam/2010-05-08/examples-1.json
+     botocore/data/iam/2010-05-08/paginators-1.json
+     botocore/data/iam/2010-05-08/service-2.json
+     botocore/data/iam/2010-05-08/waiters-2.json
 -    botocore/data/identitystore/2020-06-15/paginators-1.json
 -    botocore/data/identitystore/2020-06-15/service-2.json
 -    botocore/data/imagebuilder/2019-12-02/paginators-1.json
@@ -780,65 +835,6 @@
 -    botocore/data/kinesis-video-media/2017-09-30/service-2.json
 -    botocore/data/kinesis-video-signaling/2019-12-04/paginators-1.json
 -    botocore/data/kinesis-video-signaling/2019-12-04/service-2.json
-+    #botocore/data/es/2015-01-01/examples-1.json
-+    #botocore/data/es/2015-01-01/paginators-1.json
-+    #botocore/data/es/2015-01-01/service-2.json
-+    #botocore/data/events/2014-02-03/service-2.json
-+    #botocore/data/events/2015-10-07/examples-1.json
-+    #botocore/data/events/2015-10-07/paginators-1.json
-+    #botocore/data/events/2015-10-07/service-2.json
-+    #botocore/data/finspace-data/2020-07-13/paginators-1.json
-+    #botocore/data/finspace-data/2020-07-13/service-2.json
-+    #botocore/data/finspace/2021-03-12/paginators-1.json
-+    #botocore/data/finspace/2021-03-12/service-2.json
-+    #botocore/data/firehose/2015-08-04/examples-1.json
-+    #botocore/data/firehose/2015-08-04/paginators-1.json
-+    #botocore/data/firehose/2015-08-04/service-2.json
-+    #botocore/data/fis/2020-12-01/paginators-1.json
-+    #botocore/data/fis/2020-12-01/service-2.json
-+    #botocore/data/fms/2018-01-01/examples-1.json
-+    #botocore/data/fms/2018-01-01/paginators-1.json
-+    #botocore/data/fms/2018-01-01/service-2.json
-+    #botocore/data/forecast/2018-06-26/paginators-1.json
-+    #botocore/data/forecast/2018-06-26/service-2.json
-+    #botocore/data/forecastquery/2018-06-26/paginators-1.json
-+    #botocore/data/forecastquery/2018-06-26/service-2.json
-+    #botocore/data/frauddetector/2019-11-15/paginators-1.json
-+    #botocore/data/frauddetector/2019-11-15/service-2.json
-+    #botocore/data/fsx/2018-03-01/paginators-1.json
-+    #botocore/data/fsx/2018-03-01/service-2.json
-+    #botocore/data/gamelift/2015-10-01/examples-1.json
-+    #botocore/data/gamelift/2015-10-01/paginators-1.json
-+    #botocore/data/gamelift/2015-10-01/service-2.json
-+    #botocore/data/glacier/2012-06-01/examples-1.json
-+    #botocore/data/glacier/2012-06-01/paginators-1.json
-+    #botocore/data/glacier/2012-06-01/service-2.json
-+    #botocore/data/glacier/2012-06-01/waiters-2.json
-+    #botocore/data/globalaccelerator/2018-08-08/paginators-1.json
-+    #botocore/data/globalaccelerator/2018-08-08/service-2.json
-+    #botocore/data/glue/2017-03-31/examples-1.json
-+    #botocore/data/glue/2017-03-31/paginators-1.json
-+    #botocore/data/glue/2017-03-31/service-2.json
-+    #botocore/data/greengrass/2017-06-07/paginators-1.json
-+    #botocore/data/greengrass/2017-06-07/service-2.json
-+    #botocore/data/greengrassv2/2020-11-30/paginators-1.json
-+    #botocore/data/greengrassv2/2020-11-30/service-2.json
-+    #botocore/data/groundstation/2019-05-23/paginators-1.json
-+    #botocore/data/groundstation/2019-05-23/service-2.json
-+    #botocore/data/guardduty/2017-11-28/paginators-1.json
-+    #botocore/data/guardduty/2017-11-28/service-2.json
-+    #botocore/data/health/2016-08-04/examples-1.json
-+    #botocore/data/health/2016-08-04/paginators-1.json
-+    #botocore/data/health/2016-08-04/service-2.json
-+    #botocore/data/healthlake/2017-07-01/paginators-1.json
-+    #botocore/data/healthlake/2017-07-01/service-2.json
-+    #botocore/data/honeycode/2020-03-01/paginators-1.json
-+    #botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
-+    #botocore/data/honeycode/2020-03-01/service-2.json
-+    #botocore/data/iam/2010-05-08/examples-1.json
-+    #botocore/data/iam/2010-05-08/paginators-1.json
-+    #botocore/data/iam/2010-05-08/service-2.json
-+    #botocore/data/iam/2010-05-08/waiters-2.json
 +    #botocore/data/identitystore/2020-06-15/paginators-1.json
 +    #botocore/data/identitystore/2020-06-15/service-2.json
 +    #botocore/data/imagebuilder/2019-12-02/paginators-1.json
@@ -908,9 +904,17 @@
 -    botocore/data/kinesisvideo/2017-09-30/examples-1.json
 -    botocore/data/kinesisvideo/2017-09-30/paginators-1.json
 -    botocore/data/kinesisvideo/2017-09-30/service-2.json
--    botocore/data/kms/2014-11-01/examples-1.json
--    botocore/data/kms/2014-11-01/paginators-1.json
--    botocore/data/kms/2014-11-01/service-2.json
++    #botocore/data/kinesisanalytics/2015-08-14/examples-1.json
++    #botocore/data/kinesisanalytics/2015-08-14/paginators-1.json
++    #botocore/data/kinesisanalytics/2015-08-14/service-2.json
++    #botocore/data/kinesisanalyticsv2/2018-05-23/paginators-1.json
++    #botocore/data/kinesisanalyticsv2/2018-05-23/service-2.json
++    #botocore/data/kinesisvideo/2017-09-30/examples-1.json
++    #botocore/data/kinesisvideo/2017-09-30/paginators-1.json
++    #botocore/data/kinesisvideo/2017-09-30/service-2.json
+     botocore/data/kms/2014-11-01/examples-1.json
+     botocore/data/kms/2014-11-01/paginators-1.json
+     botocore/data/kms/2014-11-01/service-2.json
 -    botocore/data/lakeformation/2017-03-31/paginators-1.json
 -    botocore/data/lakeformation/2017-03-31/service-2.json
 -    botocore/data/lambda/2014-11-11/service-2.json
@@ -1041,17 +1045,6 @@
 -    botocore/data/pinpoint-sms-voice/2018-09-05/service-2.json
 -    botocore/data/pinpoint/2016-12-01/examples-1.json
 -    botocore/data/pinpoint/2016-12-01/service-2.json
-+    #botocore/data/kinesisanalytics/2015-08-14/examples-1.json
-+    #botocore/data/kinesisanalytics/2015-08-14/paginators-1.json
-+    #botocore/data/kinesisanalytics/2015-08-14/service-2.json
-+    #botocore/data/kinesisanalyticsv2/2018-05-23/paginators-1.json
-+    #botocore/data/kinesisanalyticsv2/2018-05-23/service-2.json
-+    #botocore/data/kinesisvideo/2017-09-30/examples-1.json
-+    #botocore/data/kinesisvideo/2017-09-30/paginators-1.json
-+    #botocore/data/kinesisvideo/2017-09-30/service-2.json
-+    #botocore/data/kms/2014-11-01/examples-1.json
-+    #botocore/data/kms/2014-11-01/paginators-1.json
-+    #botocore/data/kms/2014-11-01/service-2.json
 +    #botocore/data/lakeformation/2017-03-31/paginators-1.json
 +    #botocore/data/lakeformation/2017-03-31/service-2.json
 +    #botocore/data/lambda/2014-11-11/service-2.json
diff --git a/contrib/python/botocore/py3/patches/04-fix-ya.make.patch b/contrib/python/botocore/py3/patches/04-fix-ya.make.patch
index df206c1dacf..165d8d55e11 100644
--- a/contrib/python/botocore/py3/patches/04-fix-ya.make.patch
+++ b/contrib/python/botocore/py3/patches/04-fix-ya.make.patch
@@ -769,10 +769,69 @@
 -    botocore/data/honeycode/2020-03-01/paginators-1.json
 -    botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
 -    botocore/data/honeycode/2020-03-01/service-2.json
--    botocore/data/iam/2010-05-08/examples-1.json
--    botocore/data/iam/2010-05-08/paginators-1.json
--    botocore/data/iam/2010-05-08/service-2.json
--    botocore/data/iam/2010-05-08/waiters-2.json
++    #botocore/data/es/2015-01-01/examples-1.json
++    #botocore/data/es/2015-01-01/paginators-1.json
++    #botocore/data/es/2015-01-01/service-2.json
++    #botocore/data/events/2014-02-03/service-2.json
++    #botocore/data/events/2015-10-07/examples-1.json
++    #botocore/data/events/2015-10-07/paginators-1.json
++    #botocore/data/events/2015-10-07/service-2.json
++    #botocore/data/evidently/2021-02-01/paginators-1.json
++    #botocore/data/evidently/2021-02-01/service-2.json
++    #botocore/data/finspace-data/2020-07-13/paginators-1.json
++    #botocore/data/finspace-data/2020-07-13/service-2.json
++    #botocore/data/finspace/2021-03-12/paginators-1.json
++    #botocore/data/finspace/2021-03-12/service-2.json
++    #botocore/data/firehose/2015-08-04/examples-1.json
++    #botocore/data/firehose/2015-08-04/paginators-1.json
++    #botocore/data/firehose/2015-08-04/service-2.json
++    #botocore/data/fis/2020-12-01/paginators-1.json
++    #botocore/data/fis/2020-12-01/service-2.json
++    #botocore/data/fms/2018-01-01/examples-1.json
++    #botocore/data/fms/2018-01-01/paginators-1.json
++    #botocore/data/fms/2018-01-01/service-2.json
++    #botocore/data/forecast/2018-06-26/paginators-1.json
++    #botocore/data/forecast/2018-06-26/service-2.json
++    #botocore/data/forecastquery/2018-06-26/paginators-1.json
++    #botocore/data/forecastquery/2018-06-26/service-2.json
++    #botocore/data/frauddetector/2019-11-15/paginators-1.json
++    #botocore/data/frauddetector/2019-11-15/service-2.json
++    #botocore/data/fsx/2018-03-01/paginators-1.json
++    #botocore/data/fsx/2018-03-01/service-2.json
++    #botocore/data/gamelift/2015-10-01/examples-1.json
++    #botocore/data/gamelift/2015-10-01/paginators-1.json
++    #botocore/data/gamelift/2015-10-01/service-2.json
++    #botocore/data/glacier/2012-06-01/examples-1.json
++    #botocore/data/glacier/2012-06-01/paginators-1.json
++    #botocore/data/glacier/2012-06-01/service-2.json
++    #botocore/data/glacier/2012-06-01/waiters-2.json
++    #botocore/data/globalaccelerator/2018-08-08/paginators-1.json
++    #botocore/data/globalaccelerator/2018-08-08/service-2.json
++    #botocore/data/glue/2017-03-31/examples-1.json
++    #botocore/data/glue/2017-03-31/paginators-1.json
++    #botocore/data/glue/2017-03-31/service-2.json
++    #botocore/data/grafana/2020-08-18/paginators-1.json
++    #botocore/data/grafana/2020-08-18/service-2.json
++    #botocore/data/greengrass/2017-06-07/paginators-1.json
++    #botocore/data/greengrass/2017-06-07/service-2.json
++    #botocore/data/greengrassv2/2020-11-30/paginators-1.json
++    #botocore/data/greengrassv2/2020-11-30/service-2.json
++    #botocore/data/groundstation/2019-05-23/paginators-1.json
++    #botocore/data/groundstation/2019-05-23/service-2.json
++    #botocore/data/guardduty/2017-11-28/paginators-1.json
++    #botocore/data/guardduty/2017-11-28/service-2.json
++    #botocore/data/health/2016-08-04/examples-1.json
++    #botocore/data/health/2016-08-04/paginators-1.json
++    #botocore/data/health/2016-08-04/service-2.json
++    #botocore/data/healthlake/2017-07-01/paginators-1.json
++    #botocore/data/healthlake/2017-07-01/service-2.json
++    #botocore/data/honeycode/2020-03-01/paginators-1.json
++    #botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
++    #botocore/data/honeycode/2020-03-01/service-2.json
+     botocore/data/iam/2010-05-08/examples-1.json
+     botocore/data/iam/2010-05-08/paginators-1.json
+     botocore/data/iam/2010-05-08/service-2.json
+     botocore/data/iam/2010-05-08/waiters-2.json
 -    botocore/data/identitystore/2020-06-15/paginators-1.json
 -    botocore/data/identitystore/2020-06-15/service-2.json
 -    botocore/data/imagebuilder/2019-12-02/paginators-1.json
@@ -838,69 +897,6 @@
 -    botocore/data/kinesis-video-media/2017-09-30/service-2.json
 -    botocore/data/kinesis-video-signaling/2019-12-04/paginators-1.json
 -    botocore/data/kinesis-video-signaling/2019-12-04/service-2.json
-+    #botocore/data/es/2015-01-01/examples-1.json
-+    #botocore/data/es/2015-01-01/paginators-1.json
-+    #botocore/data/es/2015-01-01/service-2.json
-+    #botocore/data/events/2014-02-03/service-2.json
-+    #botocore/data/events/2015-10-07/examples-1.json
-+    #botocore/data/events/2015-10-07/paginators-1.json
-+    #botocore/data/events/2015-10-07/service-2.json
-+    #botocore/data/evidently/2021-02-01/paginators-1.json
-+    #botocore/data/evidently/2021-02-01/service-2.json
-+    #botocore/data/finspace-data/2020-07-13/paginators-1.json
-+    #botocore/data/finspace-data/2020-07-13/service-2.json
-+    #botocore/data/finspace/2021-03-12/paginators-1.json
-+    #botocore/data/finspace/2021-03-12/service-2.json
-+    #botocore/data/firehose/2015-08-04/examples-1.json
-+    #botocore/data/firehose/2015-08-04/paginators-1.json
-+    #botocore/data/firehose/2015-08-04/service-2.json
-+    #botocore/data/fis/2020-12-01/paginators-1.json
-+    #botocore/data/fis/2020-12-01/service-2.json
-+    #botocore/data/fms/2018-01-01/examples-1.json
-+    #botocore/data/fms/2018-01-01/paginators-1.json
-+    #botocore/data/fms/2018-01-01/service-2.json
-+    #botocore/data/forecast/2018-06-26/paginators-1.json
-+    #botocore/data/forecast/2018-06-26/service-2.json
-+    #botocore/data/forecastquery/2018-06-26/paginators-1.json
-+    #botocore/data/forecastquery/2018-06-26/service-2.json
-+    #botocore/data/frauddetector/2019-11-15/paginators-1.json
-+    #botocore/data/frauddetector/2019-11-15/service-2.json
-+    #botocore/data/fsx/2018-03-01/paginators-1.json
-+    #botocore/data/fsx/2018-03-01/service-2.json
-+    #botocore/data/gamelift/2015-10-01/examples-1.json
-+    #botocore/data/gamelift/2015-10-01/paginators-1.json
-+    #botocore/data/gamelift/2015-10-01/service-2.json
-+    #botocore/data/glacier/2012-06-01/examples-1.json
-+    #botocore/data/glacier/2012-06-01/paginators-1.json
-+    #botocore/data/glacier/2012-06-01/service-2.json
-+    #botocore/data/glacier/2012-06-01/waiters-2.json
-+    #botocore/data/globalaccelerator/2018-08-08/paginators-1.json
-+    #botocore/data/globalaccelerator/2018-08-08/service-2.json
-+    #botocore/data/glue/2017-03-31/examples-1.json
-+    #botocore/data/glue/2017-03-31/paginators-1.json
-+    #botocore/data/glue/2017-03-31/service-2.json
-+    #botocore/data/grafana/2020-08-18/paginators-1.json
-+    #botocore/data/grafana/2020-08-18/service-2.json
-+    #botocore/data/greengrass/2017-06-07/paginators-1.json
-+    #botocore/data/greengrass/2017-06-07/service-2.json
-+    #botocore/data/greengrassv2/2020-11-30/paginators-1.json
-+    #botocore/data/greengrassv2/2020-11-30/service-2.json
-+    #botocore/data/groundstation/2019-05-23/paginators-1.json
-+    #botocore/data/groundstation/2019-05-23/service-2.json
-+    #botocore/data/guardduty/2017-11-28/paginators-1.json
-+    #botocore/data/guardduty/2017-11-28/service-2.json
-+    #botocore/data/health/2016-08-04/examples-1.json
-+    #botocore/data/health/2016-08-04/paginators-1.json
-+    #botocore/data/health/2016-08-04/service-2.json
-+    #botocore/data/healthlake/2017-07-01/paginators-1.json
-+    #botocore/data/healthlake/2017-07-01/service-2.json
-+    #botocore/data/honeycode/2020-03-01/paginators-1.json
-+    #botocore/data/honeycode/2020-03-01/paginators-1.sdk-extras.json
-+    #botocore/data/honeycode/2020-03-01/service-2.json
-+    #botocore/data/iam/2010-05-08/examples-1.json
-+    #botocore/data/iam/2010-05-08/paginators-1.json
-+    #botocore/data/iam/2010-05-08/service-2.json
-+    #botocore/data/iam/2010-05-08/waiters-2.json
 +    #botocore/data/identitystore/2020-06-15/paginators-1.json
 +    #botocore/data/identitystore/2020-06-15/service-2.json
 +    #botocore/data/imagebuilder/2019-12-02/paginators-1.json
@@ -978,9 +974,17 @@
 -    botocore/data/kinesisvideo/2017-09-30/examples-1.json
 -    botocore/data/kinesisvideo/2017-09-30/paginators-1.json
 -    botocore/data/kinesisvideo/2017-09-30/service-2.json
--    botocore/data/kms/2014-11-01/examples-1.json
--    botocore/data/kms/2014-11-01/paginators-1.json
--    botocore/data/kms/2014-11-01/service-2.json
++    #botocore/data/kinesisanalytics/2015-08-14/examples-1.json
++    #botocore/data/kinesisanalytics/2015-08-14/paginators-1.json
++    #botocore/data/kinesisanalytics/2015-08-14/service-2.json
++    #botocore/data/kinesisanalyticsv2/2018-05-23/paginators-1.json
++    #botocore/data/kinesisanalyticsv2/2018-05-23/service-2.json
++    #botocore/data/kinesisvideo/2017-09-30/examples-1.json
++    #botocore/data/kinesisvideo/2017-09-30/paginators-1.json
++    #botocore/data/kinesisvideo/2017-09-30/service-2.json
+     botocore/data/kms/2014-11-01/examples-1.json
+     botocore/data/kms/2014-11-01/paginators-1.json
+     botocore/data/kms/2014-11-01/service-2.json
 -    botocore/data/lakeformation/2017-03-31/paginators-1.json
 -    botocore/data/lakeformation/2017-03-31/paginators-1.sdk-extras.json
 -    botocore/data/lakeformation/2017-03-31/service-2.json
@@ -1125,17 +1129,6 @@
 -    botocore/data/pinpoint-sms-voice/2018-09-05/service-2.json
 -    botocore/data/pinpoint/2016-12-01/examples-1.json
 -    botocore/data/pinpoint/2016-12-01/service-2.json
-+    #botocore/data/kinesisanalytics/2015-08-14/examples-1.json
-+    #botocore/data/kinesisanalytics/2015-08-14/paginators-1.json
-+    #botocore/data/kinesisanalytics/2015-08-14/service-2.json
-+    #botocore/data/kinesisanalyticsv2/2018-05-23/paginators-1.json
-+    #botocore/data/kinesisanalyticsv2/2018-05-23/service-2.json
-+    #botocore/data/kinesisvideo/2017-09-30/examples-1.json
-+    #botocore/data/kinesisvideo/2017-09-30/paginators-1.json
-+    #botocore/data/kinesisvideo/2017-09-30/service-2.json
-+    #botocore/data/kms/2014-11-01/examples-1.json
-+    #botocore/data/kms/2014-11-01/paginators-1.json
-+    #botocore/data/kms/2014-11-01/service-2.json
 +    #botocore/data/lakeformation/2017-03-31/paginators-1.json
 +    #botocore/data/lakeformation/2017-03-31/paginators-1.sdk-extras.json
 +    #botocore/data/lakeformation/2017-03-31/service-2.json