Migrated from original pull request.

Functionally, the bundle is the same as the fork and pull request
created a while back.  Now the Criteria DSL is packaged as a
stand-alone library.