Removed unnecessary line.
Renaming. Starting a scenario2.
Fixed resource manager to handle same resource names in different containers.
Merge remote-tracking branch 'origin/master' into only_one_lock_in_RM