Merge "Remove code that sets user.* system properties."