Re-order CATMAN_SECTION_SUFFIX handling.

This fixes the case where PKGMANDIR is not "man".
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3
Merge branch 'joyent/release/2013Q3' into joyent/release/2013Q3_sngl