[CXF-5975] - Add support for renewing tokens "about to expire"
Recording .gitmergeinfo Changes
Some changes for 2.7