Merge "Move ssh-agent cleanup into existing exception handler" into feature/zuulv3