Store the 'entity' url of a globe separately

Currently we simply use the globe name and convert
back and forth from the entity url. This causes an issue
when we do not have the globe hardcoded. Now we store
the entity url separately and only fallback upon globes
if the entity url is not set.

Change-Id: I942d391be8298bf046cd013332ea24687339bb51
Merge "Store the 'entity' url of a globe separately"