Refs #8741. Revert "Remove all the trailing spaces."

This introduced a lot of pain when merging.