WL-3725 : Expand templates if property is set

WL-3725 : Prefix property with toolname
Merge pull request #32 from ox-it/WL-3725

WL-3725 : Expand templates if property is set