MDL-22031 fixed installer regression, adding more defines that are later done in...