ENG-4959: add IndexCounter support for SELECT COUNT(*) FROM T WHERE C1 = ? AND C2 > / >= ? when a tree index is built on (C1, C2)
Merge branch 'master' into ENG-4959
ENG-4959: examine last filter and add to endKey; add some test cases.
ENG-4959: remove code not in use and unnecessary import.
ENG-4959: refactor variable "needPadding", add some test cases.
Merge branch 'master' into ENG-4959

Conflicts:
	src/frontend/org/voltdb/plannodes/IndexCountPlanNode.java
ENG-4959: fix index size and minor changes based on Paul's feedback.
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
Add support for the alias sql function FROM_UNIXTIME
Fix for ENG-4967, small stack size is a little too small, has caused overflow in two instances
For ENG-4979, fix accidentally single threaded auth, make timeout message clearly about timeouts
Change default excludes for log_merger.
Merge pull request #646 from VoltDB/ENG-4476-from_unixtime_alias

Add support for the alias sql function FROM_UNIXTIME
Merge pull request #645 from VoltDB/ENG-4977

ENG-4977: calculate correct width of index for pure column index and exp...
ENG-4959: undo the changes to the plannertest in this branch. Will create a new branch and add more queries.
Merge pull request #648 from VoltDB/ENG-4979

For ENG-4979, fix accidentally single threaded auth, make timeout messag...
Merge pull request #649 from VoltDB/ENG-4967

Fix for ENG-4967, small stack size is a little too small, has caused ove...
Combine the placing TVEs work in one function. Throw an error for materialized view. Clean up code for Paul's feedback.
Merge pull request #643 from VoltDB/ENG-4959

Eng 4959