Various fixes to make the Devstack exercise pass with the Devstack XVA

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