Minor code cleanup

[ycombinator]

What does this PR do?

This PR does some minor code cleanup that was originally being done as part of #2218

Why is it important?

To keep the changes in https://github.com/elastic/elastic-agent/pull/2218/files strictly relevant to feature flags and FQDN.

Checklist

• My code follows the style guidelines of this project
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• I have made corresponding change to the default configuration files
• I have added tests that prove my fix is effective or that my feature works
• I have added an entry in ./changelog/fragments using the changelog tool

Author's Checklist

• [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

[mergify]

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feature-flag-pre-cleanup upstream/feature-flag-pre-cleanup
git merge upstream/main
git push upstream feature-flag-pre-cleanup

[mergify]

This pull request does not have a backport label. Could you fix it @ycombinator? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

• backport-v./d./d./d is the label to automatically backport to the 8./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

[elasticmachine]

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

• Start Time: 2023-03-22T12:19:41.482+0000

• Duration: 19 min 21 sec

Test stats 🧪

Test	Results
Failed	0
Passed	5015
Skipped	15
Total	5030

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

• /test : Re-trigger the build.

• /package : Generate the packages.

• run integration tests : Run the Elastic Agent Integration tests.

• run end-to-end tests : Generate the packages and run the E2E Tests.

• run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

[elasticmachine]

🌐 Coverage report

Name	Metrics % (covered/total)	Diff
Packages	98.387% (61/62)	👍
Files	69.34% (147/212)	👍
Classes	68.473% (278/406)	👍
Methods	53.639% (855/1594)	👍
Lines	38.938% (9492/24377)	👍 0.007
Conditionals	100.0% (0/0)	💚

[ycombinator]

/test