Merge "Support installing os-traits from git"