CLOUDIFY-1564
updated logging
Merge remote-tracking branch 'origin/master'