Merge branch '2021-10-15-Kconfig-migrations'

- Assorted Kconfig migration patches