Merge "Deprecate more apache-http." into lmp-mr1-dev