Update to a newer snapshot.

Adjust the way *_blacklist.txt is added to the package to address
increasing divergence.

Pull in wrapper change from D14727 to fix use when symlinking to them
in ${LOCALBASE}/bin.