Merge branch 'bareme-retraite' into 'bareme-retraite2'

# Conflicts:
#   parameters/retraites/secteur_prive/regime_general_cnav/salval.yaml
2 jobs for bareme-retraite2 in 54 seconds (queued for 3 seconds)