Merge "Correct the URLs in swagger"