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