Fix merging the merge result of a merge where at least one of the sets had x/mrefs
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-ontology/src/main/java/org/molgenis/ontology/OntologyConfiguration.java
Merge branch 'master' of https://github.com/molgenis/molgenis
replaced - with _ to work around mysql table name problem if it contains a -
replaced - with _ to work around mysql table name problem if it contains a -
Merge remote-tracking branch 'origin/master'

Conflicts:
	molgenis-model-registry/src/test/resources/BioSample-Model.xlsx
fix local master
fix local master
fix local master + fix default custom entity report
Merge pull request #2056 from bartcharbon/master

fix default custom entity report + fix BioSample model emx file