Fixing upgrade issues seen in R1.10 to R2.0 Centos/Havana
Adding the missing sections for upgrade from R1.30 to R2.0
closes-bug:1394813

Change-Id: I8a24e83c3b7a868a4a59578eaa916ac8a3e064ed