MergeStrategy "first" for log4j.properties
Fix test
Fix another test