51add8 Merge branch 'cboltz-apparmor-osmajor-int' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'cboltz-apparmor-osmajor-int' into 'production'
    
    Convert osmajorrelease to int to fix version check
    
    See merge request !50