Fix bug 1359455
upgrade fixes for centos 1.05 to 1.10 upgrade.

Change-Id: I4e0ac1305dd20afed97575e329c33cb14ce66889