Ensure OAuth2 config matches zf-oauth2 module

- Include the "storage" key
Merge branch 'hotfix/zf-oauth2-6'

Final fix for zfcampus/zf-oauth2#6