Pull request comments from jumarko incorporated.
FEATURE: ATP-1799 Additional improvement making it possible to have a different host for retrieving tokens.