Add --user-cache-directory, and fix CL-overrides, BR#2671.
Add <units> backward compatibility tag to IndianSettlement readChild.