Added tags for Havana release and config for Icehouse

Resolves bug 1240480

Change-Id: I91efc89b48670880eb469ac472b492e73719a2ea