Merge pull request #1621 from RosettaCommons/vmullig/fix_icc16 Fix additional issues to allow compilation with icc 16.0.2. This doesn't fix everything, yet, but gets us closer to being able to compile with icc. No test changes expected.

• Summary