Added add ConfigurationSource to Builder.
Changed log4j setup.
Merge remote-tracking branch 'origin/master'