Use a better approach than 33c24278

(cherry picked from commit 7f635eeb)

Conflicts:
	connectivity/source/manager/mdrivermanager.cxx
	connectivity/source/manager/mdrivermanager.hxx

Change-Id: Ic7ce5449d4c5e5231c838f9b7733fd4703e6252c