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

Change-Id: I8b0a54d35e51b74e3c4c22f6ad343151b239caa6