270f23d Implement changes requested in upstream review and pushed upstream (#1157720)

Authored and Committed by Elio Maldonado 7 years ago
    Implement changes requested in upstream review and pushed upstream (#1157720)
    
    - merge the two policy related patches
    
        
file modified
+62 -25
file modified
+4 -4