status commit
Merge branch 'goodbye-inbox-assert' into sync-status-display

Conflicts:
	data/lib/mailapi/mailslice.js
status commit: plane is landing
re-green all unit tests

This is primarily fall-out from:
- Hopefully finally getting rid of all timezone issues by always having
  messages generated clustered around noon of the current timezone.  We
  use age_incr_every to still have multiple messages per day where
  required.
- Fix fallout from syncs running mutexed, including logging changes to
  support expectations on this.
Merge remote-tracking branch 'upstream/master' into sync-status-display

Conflicts:
	data/lib/mailapi/mailslice.js
progress broadly works, more unit tests
Merge branch 'imap-sync-folder-list-glitch' into sync-status-display

Conflicts:
	data/lib/mailapi/testhelper.js
	test/unit/test_mail_html.js
fix IMAP probe, add repeated refresh test, fix some test bitrot; new failures

The timezone parsing bug may have caused me to standardize the tests to
have bad normalized values.  I will investigate now and renormalize.
re-green unit tests; inspected dates to verify

(In my previous set of timezone-greening tests, I had screwed up the
timezone logic and did not leverage the ability to easily inspect what
we crammed into the server.  I inspect this time.  Mea culpa.  Although,
NB: none of this stuff has hit the tree yet, so not too much mea culpa!)
Merge remote-tracking branch 'upstream/master' into sync-status-display
checkpoint good failing test, some tests disabled for speed
Merge remote-tracking branch 'upstream/master' into sync-status-display

Conflicts:
	data/lib/mailapi/activesync/folder.js
	data/lib/mailapi/testhelper.js

Primary conflicts were:
- extraFlag versus extraFlags for expanding view uses
- added progress to be passed to activesync enumerate folders
checkpoint for merge; about to touch maildb in a conflicty way
Merge branch 'master' of github.com:mozilla-b2g/gaia-email-libs-and-more into sync-status-display

Conflicts:
	data/lib/mailapi/accountcommon.js
	data/lib/mailapi/testhelper.js
	test/unit/test_compose.js
checkpoint for merge to see breakage
Merge remote-tracking branch 'upstream/master' into sync-status-display
fix our test JSM for new CommonJS-esque JS modules impl for b2g
use endpoint to relay account state change
unit test is green; simple manual smoke-testing works
failed grows should be syncfailed; update activesync test helper