Round one of spi checkstyle compliance
Merge pull request #2737 from pveentjer/checkstyle/3.x/spi

Round one of spi checkstyle compliance