Backport and reimplement the jpa QueryBuilder functionality from irk/calendar/skillbank
Remove unreleased flag in preparation for release