Fix issues with "GenerateDebugInformation". These
are mostly from the following commits, but also
include a related fix to the v140/v141 file.

Original header commits:
 v10-v14 commit v3.5.0-rc1~71^2
 v140/v141 commit v3.9.0-rc6~15^2~1