Merge branch 'hotfix/2.1.6'
Merge branch 'develop'
Rename table with authbucket_oauth2_ prefix.
Merge branch 'hotfix/2.1.7' into develop