Merge "Fix import in nova cli tests"