EAGLESIX-3015: Matcher changes for mongo 2.6.5
EAGLESIX-3015: Move contents of Matcher2.js to Matcher.js