Merge "Work around version conflicts between Rift and Ubuntu archives"