fixing upgrade issues in upgrade from R1.20 to R2.0 Ubuntu/Havana

Change-Id: I402e4c76d687a7e755b81410f963b3e5870fa4cf
Merge "fixing upgrade issues in upgrade from R1.20 to R2.0 Ubuntu/Havana" into R2.0