Merge pull request #542 from cloudsufi/cherry-pick/6de940cb40bf9dc23e… #1212

Job	Run time
build (mysql-plugin)	1h 45m 33s
build (postgresql-plugin)	25m 32s
build (oracle-plugin)	2h 13m 12s
build (mssql-plugin)	1h 21m 29s
build (cloudsql-mysql-plugin)	59m 31s
build (cloudsql-postgresql-plugin)	42m 2s
	7h 27m 19s

Provide feedback