QA-169
adding a new system property for the logs folder
Merge remote-tracking branch 'origin/master'