minor changes
Merge branch '3.0' of https://github.com/mravi/incubator-phoenix into 3.0