Add FD and filename metadata for JSON output
Merge remote-tracking branch 'upstream/master'
Add better path handling fd-info json output option