Fixing upgrade issues seen in R1.10 to R2.0 Centos/Havana
closes-bug:1394813

Change-Id: Ib040adc32cbb7bc7426ad191dc89963f7d57b4c9
Merge "Fixing upgrade issues seen in R1.10 to R2.0 Centos/Havana closes-bug:1394813" into R2.0