Linux: Port fixes for gpu hang to 3.17
Merge pull request #3687 from fritsch/intel

Linux: Port fixes for gpu hang to 3.17