Added changes to support new architecture with xenserver

Change-Id: Iff851438553528b9051edd380ecbb2c0415cbf78
Amendments

Change-Id: Ic8048c96199b7ef3ab1e463f8827b5c8e45a1659