Lots of work on documentation and some minor checkstyle
Merge pull request #2906 from pveentjer/cleanup/3.x/spi-documentation-checkstyle

Lots of work on documentation and some minor checkstyle