Fixed issues with not using merged task instance in the cache
Fix for locking issue on merged objects
This is the real fix :-)

Merge branch 'lab1-solution' of git@github.com:tqvarnst/jdg-labs.git
into lab1-solution

Conflicts:
	projects/lab/src/main/java/org/jboss/infinispan/demo/TaskService.java