Merge pull request #1714 from chandnich/sgiclark-helios

SGI-Clark.Helios platform support patches