Double commit Bug fix:1375955 and other temptest run fixes for havana and icehouse

Change-Id: Ic24e5247c337947221480be22ee041d50f023ad5
Merge "Double commit Bug fix:1375955 and other temptest run fixes for havana and icehouse"