Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
ACCUMULO-1730 set offsets for AND and OR parse nodes
ACCUMULO-1730 Rename variable for clarity.
ACCUMULO-1730 Correct start and end indices for AND and OR nodes.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
ACCUMULO-1730 Make normalize and stringify methods public.