2df2107 Rebase to 8.30.0

Authored and Committed by rsroka 6 years ago
    Rebase to 8.30.0
    
    - added patch that resolves imgssapi compilation errors
    
        
file modified
+2 -0
file modified
+8 -2
file modified
+2 -2