Fix wrong public endpoint for Sahara

Sahara endpoint in keystone has internal IP instead public IP
Closes-bug: #1383256

Change-Id: I2b0e0d38b799bf36d38e0298012b0f7f7be03770
Merge "Fix wrong public endpoint for Sahara" into stable/5.1