Quick fix for first_available_file and roles
Merge pull request #2656 from dstoflet/first_available_file_fix

Quick fix for first_available_file and role support