Commit to be able to merge changes
Merge branch 'master' of https://github.com/everit-org/ecm-component.git

Conflicts:
	core/src/main/java/org/everit/osgi/ecm/component/internal/FactoryComponentContainerImpl.java