Merge branch 'sfp_types' into 'master'

Add more speed types for SFP

See merge request !6052
3 jobs for master in 57 minutes and 24 seconds (queued for 2 seconds)