ACCUMULO-1730 improvements

Correct start and end indices for AND and OR nodes.

See https://issues.apache.org/jira/browse/ACCUMULO-1730 for discussion.