Merge pull request #541 from cloudsufi/cherry-pick/5952ef738031950e35… #1209

Job	Run time
build (mysql-plugin)	1h 43m 25s
build (postgresql-plugin)	23m 54s
build (oracle-plugin)	2h 11m 12s
build (mssql-plugin)	1h 19m 10s
build (cloudsql-mysql-plugin)	53m 35s
build (cloudsql-postgresql-plugin)	41m 43s
	7h 12m 59s

Provide feedback