Sync log4j.properties template with current default server config
Update log4j tests based on new template
Merge branch 'update_log4j_template'