CAMEL-7429 Camel Properties Component concatenation issue

I've changed the logic for finding and replacing properties. All the previous tests still pass and the new contatenation one of Adrea is working too.