Merge "Fixing two tests when nova-net is enabled and run_validation = True"