Merge branch 'properties'

Conflicts:
	framework/private/src/properties.c

git-svn-id: https://svn.apache.org/repos/asf/incubator/celix/trunk@1556864 13f79535-47bb-0310-9956-ffa450edef68