SLING-2275 Reverting the property name consolidation. This breaks configuration compatibility with release 1.0 !