f50a551 sync with OpenStack Queens release

Authored and Committed by mrunge 6 years ago
    sync with OpenStack Queens release
    
        
file modified
+1 -0
file modified
+48 -37
file modified
+1 -1