AMQ-7289 - Fix failing HTTP tests
12 files changed