Merging in changes (r5491): Taking into account that dataSource may contain socket information after the database name.
Merging in changes (r5491): Taking into account that dataSource may contain socket information after the database name.

haakonsk/O2-Framework,haakonsk/O2-Framework,haakonsk/O2-Framework,haakonsk/O2-Framework