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

Change-Id: I27e6599e36d65d08980128bae922119990d634f4
Merge "fixing issues seen in upgrade from R1.20 to R2.0 in ubuntu/Havana"