Changes for resolving merge conflicts in the Release branch

[santoshgh317]

Description

Mandatory Checklist

• Please choose the target release of Azure PowerShell. (⚠️Target release is a different concept from API readiness. Please click below links for details.)

  • General release
  • Public preview
  • Private preview
  • Engineering build
  • No need for a release

• Check this box to confirm: I have read the Submitting Changes section of CONTRIBUTING.md and reviewed the following information:

• SHOULD update ChangeLog.md file(s) appropriately
  • Update src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md.
    • A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header in the past tense.
  • Should not change ChangeLog.md if no new release is required, such as fixing test case only.
• SHOULD regenerate markdown help files if there is cmdlet API change. Instruction
• SHOULD have proper test coverage for changes in pull request.
• SHOULD NOT adjust version of module manually in pull request

[azure-client-tools-bot-prd]

Thanks for your contribution! The pull request validation has started. Please revisit this comment for updated status.

[microsoft-github-policy-service]

Thank you for your contribution @santoshgh317! We will review the pull request and get back to you soon.

[notyashhh]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 3 pipeline(s).

[github-actions]

‼️ Do NOT use squash to merge this pull request. All the commits must be merged to the target branch.
‼️ Enable "Allow merge commits" in the pull request settings. Select "Merge Commits" to merge the PR. Then go back to settings and disable the option.

[santoshgh317]

@microsoft-github-policy-service agree company="Microsoft"

[notyashhh]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 3 pipeline(s).