Update Havana references to Icehouse

Please consider including this on a new Icehouse branch