Backport changes from GT6 branch: Fixes for CentOS 7, SLES 11, Ubuntu 14.04