DDF-242 modified to use slf4j syntax
DDF-245 merge fix