Fixing broken merge in the devstack XVA build

Signed-off-by: Robert Breker <robert.breker@citrix.com>