Livestatus build merge fixup