Pre export name fix

Updated to reflect usage of file_name instead of name when downloading from
glance.
Merge "Pre export name fix" into stable/folsom