Allow disabling max-ping-out-of-flying (#1551)

Allow disabling max-ping-out-of-flying (#1551) #335