bug 1011550: include device in fota mar filenames - be less fussy about FOTA mar name. r=aki