Merge "BUG 3858 - Increasing default token cache expiry to 60min"