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
Bug 994359 - Update Bitbucket certificate fingerprint; r=edmorley

Certificate updated per
http://blog.bitbucket.org/2014/04/08/bitbuckets-ssl-certificates-are-changing/

DONTBUILD (NPOTB)

--HG--
extra : rebase_source : 7b2acdad8221d40629a0fff7b9b9fcfbd51eb1a5
extra : amend_source : 2138af8ab774420f466e33914f2abdb82a52df25
Merge mulet
Final fix for mulet merge