Fix missing havana branch

Use the havana-eol tag. Ditto grizzly.

Change-Id: I744a36f0b5cd52b04eaeb983bd47606dbb5cafe8