9ffbb61 Sync with OpenStack pike release

Authored and Committed by mrunge 6 years ago
    Sync with OpenStack pike release
    
        
file modified
+1 -0
file modified
+12 -15
file modified
+1 -1