Merge branch 'sfp_types' into 'master'

Add more speed types for SFP

See merge request !6052
8 jobs for master in 39 minutes and 45 seconds (queued for 4 seconds)