The needed fixes are in master branch and one more fix it still in a pull request, bring them all in until 6.0.5 is released Signed-off-by: Khem Raj <raj.khem@gmail.com>