Changed OSGi properties to not have the "prop." prefix
Kept legacy support for fallback to existing properties with "prop." prefix