Merge "Revert "Remove org.apache.http.legacy from bootclasspath""