AI-616 Fix relevance expression generation for ODK
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4