Applied Stuart's patch to use variable substitution via BND to define the properties in default.properties from the properties in config.properties. (FELIX-380)