Make the token available in a non-egi specific location
No changes between token-location and master