Add default endpoint in case it's not found in service catalog

Change-Id: Ia4a06e32eeb1738afc75b4ad6ddec9432313910a
Merge "Add default endpoint in case it's not found in service catalog"