Made token_format configurable

Fixes: rhbz#975153
Change-Id: Ia679324307d4091f8b8ca98b02ab81760d2b4f8a
Merge "Made token_format configurable"