HAP-535 - Generic Deployment Properties, add support for multi values under specific key