Merge "Fix barbican_tempest option group"