Merge branch 'stf606-final' into 'master'

Update OAS to version 3.1.0

See merge request !7
2 jobs for v2.2.1-OAS3.1
latest