Cherry-pick 2475121 from Dhiru - Travis/Coverity support. Closes #512.