more fixes specific to 1.10 to 2.0 upgrade.
fix for centos64 1.20 to 2.0 upgrade

Change-Id: I0ab8bdbe8325da2fee71505e3b989c4eb3808d89
Merge "more fixes specific to 1.10 to 2.0 upgrade. fix for centos64 1.20 to 2.0 upgrade" into R2.0