Improved Prediction of Hydraulic Conductivity with Soil Water Retention Curve that Accounts for Both Capillary and Adsorption Forces