Don't report random files in json dirs (like roles/environments)
Don't list local cookbook files that wouldn't be uploaded
Merge branch 'CHEF-4272'