Merge pull request #287 from hazendaz/master

Update log4j2 to 2.1