Rename heat_watch_server_url to watch_server_url

The other *_server_url parameters are not prefixed with heat_ and this
is already in the heat namespace.

Change-Id: I24effcfedccb7b69b4e4d022db6676da51083401