Merge pull request #625 from cloudsufi/cherry-pick/GA_Fixes #1663

Job	Run time
build (mssql-plugin)	1h 20m 44s
build (postgresql-plugin)	25m 17s
build (mysql-plugin)	1h 25m 52s
build (cloudsql-mysql-plugin)	54m 13s
build (cloudsql-postgresql-plugin)	53m 47s
build (oracle-plugin)	2h 32m 27s
	7h 32m 20s

Provide feedback