Merge pull request #2871 from hashicorp/mysql-2017-12-01-and-2020-01-01

Merge pull request #2871 from hashicorp/mysql-2017-12-01-and-2020-01-01 #635