update hawtio, fixes #2598 and more #2457 polishing