Merge branch 'stable-3.9'

* stable-3.9:
  Fix frontend endpoint call for http token generation

Change-Id: I419351288e69d7b32518f8217d2c16a29b48cd3c