Cleanup for test upgrade from Havana to Icehouse

 - BASE_RELEASE is now Havana, TARGET_RELEASE is now Icehouse.
 - Clean up any specific upgrade step previously necessary.