Add more commons-logging, servlet excludes to avoid conflicts in assembly when building for YARN