Updates Q7 tests configuration.

* Changes the EGit update site to our custom build with the support of
the logical model.
* Adds some extra features in the Kepler platform since they are needed
to execute some tests:
  Papyrus Luna
  EMF Compare Extra features (Papyrus, UML et GMF integration)

Change-Id: I1fb7817157dabb848bf29deb173203976d645111
[443695] Update Conflict Icon & Label

In case where all differences under a conflict have been resolved, then
the conflict icon turned to gray, and the label shows [resolved].
In case where differences still to be merge, the label shows the number.

Bug:443695
Change-Id: I485d99553e304fc77dd8e01e02e3f3a36560ab58
Signed-off-by: Axel Richard <axel.richard@obeo.fr>