Backport misc/kdeartwork3 fix from trunk.
Backport net/kdenetwork3 fix from trunk.
Merge branch 'joyent/feature/miscfix/2014Q2' into joyent/release/2014Q2