Rebasing on some large changes from Axiom

This rebase is probably the easiest way for axiom to pull in the change.

We'll need to fix the time_begin and time_end stuff.  they are using H2 now and not postgres.  The columns will have to be added into the initdb.sql file Axiom added to Git.

+    time_begin timestamp with time zone,
+    time_end timestamp with time zone