Partial fix for bug 1355001 Centos upgrade from 1.05 to 1.10 needs packaging changes.

Change-Id: I76997aeb022028ac08233e0bd00d0f5ca6328336
Merge "Partial fix for bug 1355001 Centos upgrade from 1.05 to 1.10 needs packaging changes." into R1.10