Bug 843559 - Followup patch to rename string. r=anton
Bug 854937: Fix reason code for bootstrap addon dropped in profile extensions folder. r=Mossop,Unfocused
merge m-c to fx-team