Change-Id: Ibc73e46c22f1c63b2f80ff850767bdbfed3355a3 Implements: blueprint add-authentication-token-support