Tempest image: handling difference between icehouse and havana image

Change-Id: Iec917f091c503006c7659f705c2de452519ee36d