Merge branch 'sdk-migrations-2' of github.com:aws-amplify/amplify-cli into sdk-migrations-2

Author: aws-amplify-bot

packages/amplify-e2e-tests/src/__tests__/custom-resource-with-storage.test.ts

@@ -25,7 +25,6 @@ describe('adding custom resources test', () => {
   let projRoot: string;
   const envName = 'devtest';
   beforeEach(async () => {
-    process.env.AMPLIFY_ENABLE_DEBUG_OUTPUT = 'true';
     projRoot = await createNewProjectDir(projectName);
     await initJSProjectWithProfile(projRoot, { envName, disableAmplifyAppCreation: false });
     await gitInit(projRoot);

packages/amplify-e2e-tests/src/cleanup-codebuild-resources.ts

@@ -1085,8 +1085,8 @@ const cleanupAccount = async (account: AWSAccountInfo, accountIndex: number, fil
 
 /**
  * Execute the cleanup script.
- * Cleanup will happen sequentially across accounts to avoid resource exhaustion,
- * based on the requested filter parameters (i.e. for a given workflow, job, or all stale resources).
+ * Cleanup will happen in parallel across all accounts within a given organization,
+ * based on the requested filter parameters (i.e. for a given workflow, or all stale resources).
  * Logs are emitted for given account ids anywhere we've fanned out, but we use an indexing scheme instead
  * of account ids since the logs these are written to will be effectively public.
  */