chore: sync main into develop (resolve conflicts)#455

wtobis-splunk merged 3 commits intodevelopsplunk/addonfactory-solutions-library-python:developfrom

fix/sync-main-into-developsplunk/addonfactory-solutions-library-python:fix/sync-main-into-developCopy head branch name to clipboard