Merge "Make update_extra_routes use **kwargs & doc string"