pkgtools/pkgin: backport catman fix from trunk.
Upgrade percona-toolkit to 2.2.6.
Merge branch 'joyent/feature/miscfix/2013Q4' into joyent/release/2013Q4