Merge "Bug 2669: Use slf4j Logger instead of akka LoggingAdapter"