Merge branch 'osl-secrets' into 'develop'

Add secret characteristic blocks in the lifecycle rules editor

See merge request !44