CLOUDIFY-1758 Merged logging properties files