bug 918143
-check for existing notification with same tag before inserting a new notification on lockscreen.
-add marionette tests for lockscreen notifications.

r=qDot
Bug 918998 - Hide email info in notification bar when there is only one configured account. Show email info when there are one more accounts.
Bug 928890: Fix FB import for webidl changes.
Bug 928922: Handle null value in contacts edit screen
Bug 928939: Check to see if contacts.Search is loaded in delete path.
Bug 928954: Fix contact sim import for webidl changes
Bug 928635 - Fix handling of array properties in the New Contact form. r=bkelly
Bug 927788 - Add compatibility with NetworkStats API 2 for costcontrol
Merge pull request #12977 from wanderview/contacts-edit-defobj

Bug 928922: Handle null value in contacts edit screen. r=arcturus
Merge pull request #12981 from wanderview/contacts-delete-search

Bug 928939: Check to see if contacts.Search is loaded in delete path.  r=arcturus
Merge pull request #12962 from reubenmorais/more-webidl-fixes

Bug 928635 - Fix handling of array properties in the New Contact form.  r=wanderview
Merge pull request #12982 from wanderview/contacts-webidl-sim

Bug 928954: Fix contact sim import for webidl changes.  r=arcturus
Bug 929078: Re-enable gaia-ui-tests hidden for webidl bustage.
Bug 929071 - [Contacts] Fix contacts merging unit test to ensure blob in |photo| field due to webidl change
Merge pull request #12934 from acperez/bug-927788

Bug 927788 - Add compatibility with NetworkStats API 2 for costcontrol.
Merge pull request #12988 from arcturus/bug-929071

Bug 929071 - [Contacts] Fix contacts merging unit test to ensure blob in |photo| field due to webidl change
Bug 929043 - [Contacts] Contacts .remove function used broken due to webidl
Merge pull request #12974 from wanderview/contacts-webidl-fb

Bug 928890: Fix FB import for webidl changes.  r=jmcf
Bug 928503 - Look for tests in subdirectories of 'unit', r=bkelly, a=test-only
Merge pull request #12989 from jonallengriffin/unittests

Bug 928503 - Look for tests in subdirectories of 'unit', r=bkelly, a=tes...