Merge "Handle double node locking snafu" into feature/zuulv3