PHOENIX-1038 Dynamically add INDEX_TYPE column to SYSTEM.CATALOG if not already there
Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0