Merge branch 'cboltz-keepalived-login' into 'production'
    
    split the login2 keepalived ipv4 and ipv6 sections due to an upstream change
    
    See merge request infra/salt!300