3121012 Update to latest upstream release

Authored and Committed by mbooth 3 years ago
    Update to latest upstream release
    Remove old obsoletes
    Avoid using deprecated source/target values
    
        
file modified
+1 -0
file modified
+14 -15
file modified
+6 -6