fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 1
fix log statement case 2
fix log statement case 2
merge-related break-fixes
even more log4j.xml changes
more capsd-related changes
Merge remote-tracking branch 'origin/master' into fix-logging