Merge "Attempt to fix the test failures on centos"