Bug 841836 - Update emulator for bug 716859, r=callek
Bug 841094 - Don't special-case extensions/ and searchplugins/ directories when creating complete and partial mar, but special-case distribution/extensions. r=rstrong,r=bhearsum