Scala Common Enrich: split out Clojure and CloudFront Collector event processing (fixes #943)