Merge "Upgrade sl4j security issue"