Merge pull request #3104 from rubenk/intel-rdt-fix-compiler-warnings