Apply brlcad patches through r54980