Fixing maintenance issues with org.apache.commons.lang3.StringUtils and Apache Commons Logging