backport 0.12.1 release (#3079)

* chore: update version

* fix(tests): break out of infinite loop for bats tests

* chore: update changelog

* fix: make-gen-delta check

internal/tests/cli/test.sh

@@ -32,8 +32,14 @@ function cleanup {
 
 trap cleanup EXIT
 
+max=120
+c=0
 until boundary scopes list; do
     echo 'waiting for boundary to be up'
+    ((c+=1))
+    if [[ $c -ge $max ]]; then
+        die "timeout waiting for boundary controller to get healthy"
+    fi
     sleep 1
 done