Merge branch '2019-03-25-master-imports'

- Convert various SPI related options to Kconfig