Change constant name of CountAggregateFunction to upper case COUNT
Merge branch 'master' of github.com:forcedotcom/phoenix