Merge pull request #1794 from RosettaCommons/vmullig/iccfix2 Reverting reversion of icc merge to re-fix icc issues.