0bdd3ee Fix a bad merge in Security

Authored and Committed by pbokoc 4 years ago
    Fix a bad merge in Security