Undone change that breaks this test
Introduced MATCH_COLLECTION

List and set matching are now implemented using a single, generic,
top-level controller called MATCH-COLLECTION.

The performance impact is very modest and this opens the perspective for
matching on other collection types.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git