upgrade hawtio and polish #2457