AMQ-1898 and AMQ-1900 Bug Fixes

[Khaled Hussein]

Hi guys,

I've created those two Jiras ( AMQ-1898, AMQ-1900), and here are the patches
to fix them. I hope to see them in 5.2 as they effect the correctness of web
reporting.

Thanks,
Khaled