Prepend the git+ to git urls if not found in _resolved

Fix #5752
Fix #6013