Properly split up the different system-property based layouts.
It's a pity we have to enumerate all the different types of layout + repo's. Perhaps it makes sense to move them to different
bundles, but I'll do that when we are ok with 'hard' dependencies to repositories
Merge branch 'master' of github.com:Dexels/navajo

Conflicts:
	optional/com.dexels.navajo.repository.file/OSGI-INF/navajo.repository.file.system.xml