Merge "Fix autohold RPC protocol" into feature/zuulv3