Fixing more bugs that has been introduced with the splitting of the devstack xva build into two stages

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