upstream has been completely unresponsive for years. - While here, rebuild patches using current naming conventions - Trim Makefile headers PR: 165312 Submitted by: Anatoly Borodin