merge fixes for ooni-support build and operation