Bug 1013433 - complete the packaged app update process; r=mfinkle,marco
Bug 1021770 - Browser Toolbox: remove extra separator next to options cog. r=jryans
Merge m-c to fx-team. a=merge
Bug 1021443 - java.lang.IllegalStateException: Already registered Webapps:Postinstall under a different type. r=jchen
Merge fx-team to m-c. a=merge