Simplify the MustacheEnvironmentCollector so that it no longer binds the Spring Environment to a Map. See gh-2242