caci discovery algorithm improvements, additional junit tests for caci
discovery and task manager
ui model merging algorithm improvement, more junit tests added