Fix for https://github.com/hawtio/hawtio/issues/1802.
Merge pull request #1803 from jcordes73/master

Fixes #1802