Backport 2206 to release/0.4.z#2297

jcrossley3 wants to merge 7 commits into

guacsec:release/0.4.zguacsec/trustify:release/0.4.zfrom

jcrossley3:backport-2206-to-release/0.4.zjcrossley3/trustify:backport-2206-to-release/0.4.zCopy head branch name to clipboard