bug 393865, 386636: Update slf4j
25 files changed