920417 Merge remote-tracking branch 'origin/scripts' into users/mkoutny/SLE12-SP5/scripts-update

Merged and Committed by Michal Koutný a month ago
    Merge remote-tracking branch 'origin/scripts' into users/mkoutny/SLE12-SP5/scripts-update
    
        
file modified
+14 -14
file modified
+1 -1
file modified
+2 -103
file modified
+1 -1