Cosmetic changes to reduce indentation level and remove unneeded else clauses

git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/log4j2/trunk@1563563 13f79535-47bb-0310-9956-ffa450edef68