Updated patch (mostly just conflict resolution):
- fix explain code to track changes to deparse context handling
- tiny expansion of some comments (clarify in nodeAgg header
comment that aggcontexts are now EContexts rather than just
memory contexts)
- declare support for features in sql_features.txt, which had been
previously overlooked
--
Andrew (irc:RhodiumToad)