Update my employer and location
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Fix error