Fixing the upgrade issues seen in upgrade from R1.20 to R2.0 ubuntu/havana

Change-Id: I90d98cdb016c085bf1db0f3626f3b73c596f6e2e
Merge "Fixing the upgrade issues seen in upgrade from R1.20 to R2.0 ubuntu/havana" into R2.0