(maint) Derive path for status.json (rather than fixed offset from cwd)
Merge branch 'master' of https://github.com/puppetlabs/puppet