fix broken consumer history test
Merge pull request #1294 from asmacdo/fix-consumer-history-tests

fix broken consumer history test
Merge branch '2.5-dev'