Add project properties into merged props
Change parameter replacement logic: replace @...@ parameters as they are added and ${...} once merging everything is done