PHOENIX-904 Connection leak during running of upgrade (JamesTaylor)
Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix into 4.0