Backport conf-arch switch to 22.08

It was found during BuildStream 2 transition that we were using pending removal argument conf-extra for passing arch-specific arguments in bootstrap. We switched to conf-arch to make the purpose clearer. Given this change is reasonably complicated and BuildStream 1 still has conf-extra, simply remove it from conf-local to avoid duplication.