7fbe311 Sync with upstream release 2.3

Authored and Committed by merlinm 6 years ago
    Sync with upstream release 2.3
    Adds merge-standard-inventory
    
        
file modified
+2 -0
file modified
+1 -1
file modified
+9 -1