648273 Update to 18.05.

Authored and Committed by vascom a year ago
    Update to 18.05.
    
        
file modified
+1 -0
file modified
+4 -5
file modified
+1 -1