updates to enable CentOS-7.0 .

Change-Id: Ia21ed692ddf29de23f92a05836ff1e78fc9e6884