Bug 888107 - r=bjacob, a=akeybl
Bug 903362 - Permission upgrade might fail at removal. r=fabrice, a=leo+
Merge b2g18 to v1.1hd. a=merge