Merge branch 'joyent/feature/sngl/trunk' into joyent/release/trunk_sngl

Conflicts:
	lang/perl5/distinfo
	lang/perl5/patches/patch-ca