ENG-4977: calculate correct width of index for pure column index and expression index.
Merge branch 'ENG-4977' into ENG-4959

Conflicts:
	src/frontend/org/voltdb/plannodes/IndexCountPlanNode.java