log4j - config change, exceptions - did not tested
Merge remote-tracking branch 'origin/master'