change option order for license activation type
[FIX CI] various tests
Merge remote-tracking branch 'origin/next' into rca_validate_migrations