Apply backported fixes to GCC@4.9.3

[davidbeckingsale]

This was erroneously changed in #2259

Looking at one of the files that should be patched, you can see the fix in the patch is missing from GCC 4.9.3, but is applied to GCC 4.9.4

• https://github.com/gcc-mirror/gcc/blob/releases/gcc-4.9.3/gcc/cp/cfns.h
• https://github.com/gcc-mirror/gcc/blob/releases/gcc-4.9.4/gcc/cp/cfns.h

[davidbeckingsale]

cc @vsoch

[vsoch]

Yep we need this for a failing RADIUSS build for the current version of gcc on some machines. Error can be seen here https://github.com/rse-radiuss/docker-images/runs/3601406475?check_suite_focus=true without it.