i=shadow i=scjody changes missing from commit of bz-14390-att-14121 needed to get v1_4_12_RC1 to build on Cray XT3