Fix/merge conflict pipelines java#253

nirzaraghure wants to merge 4 commits into

MicrosoftDocs:mainMicrosoftDocs/pipelines-java:mainfrom

nirzaraghure:fix/merge-conflict-pipelines-javanirzaraghure/pipelines-java:fix/merge-conflict-pipelines-javaCopy head branch name to clipboard