The PR for BZ1032192 was created with intentional changes against 4.11 but
was merged after the 4.12 release.  Migrate the intential change decls to
the newer version file.