b2ee407 sync w/ rpm-master

Authored and Committed by hguemar 7 years ago
    sync w/ rpm-master
    
    Change-Id: Ic94cda00d85afb55c09dab336d89d31baef4cb61
    (cherry picked from commit a78bc36a6669878550f31bcde796be8c7a24b2d4)
    
        
file modified
+17 -54