Updated the test config file to work with the new code and modified the object
selector code so that it does not use getCollection() to get the cut flags from
the event.
Merge remote-tracking branch 'upstream/LS1_Upgrade' into LS1_Upgrade