Some Odata4J to Criteria code, and some test code.
Fix to path expansion when parent is null
Merge branch 'feature/odata4j'
Removed odata4j dependency