Fix PKG_SYSCONFDIR location as per trunk (and upstream)
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2