Bug 826118 - [email/IMAP] Connection loss may not always result in error messages during synchronization, synchronization for the folder will break until app is restarted.
IMAP server jobs need the deathback updated/cleared too.
Add withConnection and resetErrorHandling to imap/folder, to help the use of folderConn in _accessFolderForMutation to be less aware of the actual deathback setting and reseting
Use clearErrorHandler instead of resetErrorHandling
Merge pull request #160 from jrburke/bug826118_imaploss

Bug 826118 - [email/IMAP] Connection loss may not always result in error messages during synchronization, synchronization for the folder will break until app is restarted. r=squib
put worker-bootstrap.js in the right place
Make sure to route to mailapi for bridge messages, and include layer change for imap protocol stuff
Merge remote-tracking branch 'upstream/master' into worker-thread

Conflicts:
	test/unit/resources/fault_injecting_socket.js
Merge remote-tracking branch 'gh-asuth/worker-thread-build' into worker-thread
fix naive test_imap_errors merge test failure
add setZeroTimeout for main-frame-support
Fix the worst bit of bug 855219; accept empty snippets
comment out the dump() logging for postMessage traffic
Add support for running tests against b2g-desktop by setting b2g-bindir-symlink
Merge branch 'worker-thread' of github.com:asutherland/gaia-email-libs-and-more into worker-thread