merged from branches/cdmlib/2.2 7238-7345 into trunk
minor
Fixed some issues with database handling and fixed a bug in LocationService.
data sources update and tests