Merge pull request #554 from cloudsufi/cherry-pick/0d75ef3a945240a677… #1275

Job	Run time
build (mysql-plugin)	1h 54m 52s
build (postgresql-plugin)	24m 38s
build (oracle-plugin)	2h 21m 2s
build (mssql-plugin)	1h 20m 54s
build (cloudsql-mysql-plugin)	54m 56s
build (cloudsql-postgresql-plugin)	52m 59s
	7h 49m 21s

Provide feedback