Comment 4 for bug 1716815

Reviewed: https://review.openstack.org/508021
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=def03c72401df744515cc5ad965021613dff9c8f
Submitter: Jenkins
Branch: stable/pike

commit def03c72401df744515cc5ad965021613dff9c8f
Author: huangtianhua <email address hidden>
Date: Mon Sep 18 15:59:21 2017 +0800

    Make sure we can get watch server url in uwsgi mode

    We get the 'watch' server url by translating the
    'cfn' server url if the 'watch' server url is not
    configurated, but in uwsgi mode, the code logic is
    incorrect, this patch changes the logic to make sure
    that we can get the watch server url in both modes.

    Change-Id: Iebf2480f97c11474412d74726eba9cf5c8ed2193
    Closes-Bug: #1716815
    (cherry picked from commit a8af89ec9733039ec43cdad1af0821feea93499c)