[2/2] phoenix git commit: Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0

Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6cff3f04 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6cff3f04 Diff: http://git-wi

[2/2] phoenix git commit: Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0

Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cce5b928 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cce5b928 Diff: http://git-wi