Bug 1005488 - Deprecate sdk/content/content
Merge pull request #1482 from jsantell/1005488-remove-content-content

Fix Bug 1005488 - Deprecate sdk/content/content, r=@zombie
bug 1006043 - hack around lingering child process
Merge pull request #1485 from zombie/1006043-double-kill

bug 1006043 - hack around lingering child process, r=@Mossop