Amending OAuth encryption to differentiate access and refresh token storage

First commit to the 2.0.2 patch branch.  I had improperly broad-brushed my OAuth token storage updates, neglecting to notice that access tokens and refresh tokens are stored with different encryption keys.  With 2.0.1, this would basically force all upgrading users to login again, which is not the desired behavior.  This PR fixes that.