a229517 sync with OpenStack Pike release

Authored and Committed by mrunge 6 years ago
    sync with OpenStack Pike release
    
        
file modified
+1 -0
file modified
+94 -167
file modified
+1 -1