1. Make ucar/nc2/util/net tests work with httpclient4.2
2. fix some conflicts