Http server more robust against unexpected messages, and upgrade test during regular (non-building) turn