teiiddes-1902: Made properties and parameterMap local variables
Merge pull request #251 from tejones/teiiddes-1902

teiiddes-1902