Backport fixes for trusty, el7, and sles11sp3