Fold collect_map into union

[philrz]

At the time this issue is being opened, super is at commit 55d99d3.

@mccanne recently noted that he's never been a fan of the name of the collect_map aggregate function. He pointed out that it would be feasible to fold its functionality into the union aggregate function such that if union is given map values as input it could return a map.