Update Havana references to Icehouse