Fixing build for RHEL 6
Merge pull request #1939 from jlsherrill/build_fix

fixing rhel 6 build