When trying to find update site of EMF Compare, look at update site of both parent and included feature.
Revert "When trying to find update site of EMF Compare, look at update site of both parent and included feature."

This reverts commit 174ed896db526d283d50c9270cc84ed6b82c2f8c.
Revert "Added EMF Compare as included feature for Eclipse version < Kepler"

This reverts commit 476b187562041217dc292dcc1a294cb9503a2463.
Add mention of Ant-Contrib in feature license
Merge branch 'master' into mvn-build