Corrects labels after enhancement on conflicts label.

Change-Id: I27d7d3a62f8846b45bbd516086766026c6213ddb
[446739] Fixes obtaining the target feature in three-way merge of a move

We now make sure that the target feature is correctly determined. This
prevents a NullPointerException thrown during a three-way merge of a
move, in which the target containment feature is not available in the
type of the original containment feature.

Bug: 446739
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Change-Id: I98a7f37bb5e43f10ddaf4a042893ed4773bf25b9
Adds onDispose method on the resource set hooks.

The resources are unloaded and removed from the resource set on a
compare input change event using this mechanism.

Change-Id: Ifed4997876456ff0f70f4cb4e072526d5f310347