Bug 993732 - Should use renamed properties done by bug 988129. pending r=gene

Landed directly on mozilla-central in order to fix the Firefox OS bustage in today's build.
Bug 994216 - ensure desktop INI file parent directory exists to fix bustage on CLOSED TREE; r=marco"

--HG--
extra : amend_source : d72cf290cc27d2cc6baa3d68611192167c45fd8f
Merge m-c to inbound on a CLOSED TREE.