added comments back

Author: comcalvi

packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/private/singleton-policy.ts

@@ -1,5 +1,8 @@
 import * as iam from '@aws-cdk/aws-iam';
 import * as cdk from '@aws-cdk/core';
+
+// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
+// eslint-disable-next-line no-duplicate-imports, import/order
 import { Construct } from 'constructs';
 
 /**

packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/stackinstances-action.ts

@@ -1,10 +1,13 @@
 import * as codepipeline from '@aws-cdk/aws-codepipeline';
-import { Construct } from 'constructs';
 import { Action } from '../action';
 import { validatePercentage } from '../common';
 import { SingletonPolicy } from './private/singleton-policy';
 import { CommonCloudFormationStackSetOptions, StackInstances, StackSetParameters } from './stackset-types';
 
+// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
+// eslint-disable-next-line no-duplicate-imports, import/order
+import { Construct } from 'constructs';
+
 /**
  * Properties for the CloudFormationDeployStackInstancesAction
  */

packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/stackset-action.ts

@@ -1,11 +1,13 @@
 import * as codepipeline from '@aws-cdk/aws-codepipeline';
 import * as cdk from '@aws-cdk/core';
-import { Construct } from 'constructs';
 import { Action } from '../action';
 import { validatePercentage } from '../common';
 import { parseCapabilities, SingletonPolicy } from './private/singleton-policy';
 import { CommonCloudFormationStackSetOptions, StackInstances, StackSetDeploymentModel, StackSetParameters, StackSetTemplate } from './stackset-types';
 
+// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
+// eslint-disable-next-line no-duplicate-imports, import/order
+import { Construct } from 'constructs';
 
 /**
  * Properties for the CloudFormationDeployStackSetAction