2a2db2efc5
The change to remove references of XEN_INTEGRATION_BRIDGE (If5886e3711765a97f40f20e478f958b988b5a620) unfortunately left some code which should have been removed. This remaining code caused an error in some situations when deploying from scratch (which the CI avoids for expediency) Change-Id: Ia568462c9cca8cff8fcfada8148d185609d61a7d