Fix #5415

At least I think this is the underlying problem, this ensures
that the client waits for the masters payload from the syndics
if order_masters is set