Fixed modman file to avoid conflicts with other JR modules.
Merge branch 'hotfix/fix-modman' into feature/cache-resource-model-queries