Merge branch 'aws-multitenant-v2' into 'master'

Entitlements v2

See merge request !45
23 jobs for master in 32 minutes and 28 seconds (queued for 10 seconds)