use tomcat's log directory
Merge branch 'upstream' into devel
Don't break syntax in metadata XML.