refactor some long methods and add RF2 concrete domain refset import
Merge branch 'master' of https://github.com/aehrc/ontology-core