Merge #11981: Fix gitian build after libzmq bump