Merge pull request #619 from cloudsufi/bugfix/PLUGIN-1925 #1652

Job	Run time
build (cloudsql-mysql-plugin)	1h 36m 27s
build (mysql-plugin)	1h 48m 8s
build (mssql-plugin)	1h 45m 33s
build (cloudsql-postgresql-plugin)	1h 45m 30s
build (postgresql-plugin)	41m 30s
build (oracle-plugin)	2h 50m 23s
	10h 27m 31s

Provide feedback