Fixed Murano and Heat endpoint configuration logic.

Change-Id: Ib55b90feca966b9707a4cce9c885a860ec091f5e
Merge "Fixed Murano and Heat endpoint configuration logic."