These are a few minimal changes to make the CentOS basedisk build. Change-Id: I186c74c26312d5cd567c95ff8a9e7341cf01b3a4