New code for supporting Access Token Expiry
Merge commit 'd2cd2f3d4b8fd5de8c3505f0ac6f119b47c37ac6' into aab_oauthv4_research