Merge upstream r825: fix line continuation in whitespace


git-svn-id: svn+ssh://svn.freebsd.org/base/head@273273 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Perform more checks on the number of tables supplied by user.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@273274 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f