Rename heat_watch_server_url to watch_server_url

The Readme for heat-engine says it should be watch_server_url and
{{heat.watch_server_url}} is what is being used in heat.conf.

Change-Id: Ibcfec34c85901592c47eaf911aeb2eaa8049dfb7