Follow ZCML conventions

See: http://docs.zope.org/zopetoolkit/codingstyle/zcml-style.html

Fix also XML files