Merge pull request #2015 from fdlk/fix/meta

Fix/meta
Add newly created PackageImpl to parent's subpackages.
... only if the parent is not null.
Fix for issue #2016
Merge pull request #2020 from erwinwinder/master

Fix for issue #2016
Merge pull request #2019 from fdlk/master

Add newly created PackageImpl to parent's subpackages.
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/ontology

Conflicts:
	molgenis-data/src/main/java/org/molgenis/data/meta/AttributeMetaDataMetaData.java